From a3c7e4179469c6194890ad11c64f51ced48f0177 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 30 Jun 2011 13:28:42 +0100 Subject: [PATCH] Put all thirdparty code into a separate subdirectory. --- CMakeLists.txt | 15 ++++++++------- {glext => thirdparty/glext}/glext.h | 0 {glext => thirdparty/glext}/glxext.h | 0 {glext => thirdparty/glext}/wglext.h | 0 {libpng => thirdparty/libpng}/ANNOUNCE | 0 {libpng => thirdparty/libpng}/CHANGES | 0 {libpng => thirdparty/libpng}/CMakeLists.txt | 0 {libpng => thirdparty/libpng}/LICENSE | 0 {libpng => thirdparty/libpng}/README | 0 {libpng => thirdparty/libpng}/TODO | 0 {libpng => thirdparty/libpng}/libpng.txt | 0 {libpng => thirdparty/libpng}/png.c | 0 {libpng => thirdparty/libpng}/png.h | 0 {libpng => thirdparty/libpng}/pngconf.h | 0 {libpng => thirdparty/libpng}/pngdebug.h | 0 {libpng => thirdparty/libpng}/pngerror.c | 0 {libpng => thirdparty/libpng}/pngget.c | 0 {libpng => thirdparty/libpng}/pnginfo.h | 0 {libpng => thirdparty/libpng}/pnglibconf.h | 0 {libpng => thirdparty/libpng}/pngmem.c | 0 {libpng => thirdparty/libpng}/pngpread.c | 0 {libpng => thirdparty/libpng}/pngpriv.h | 0 {libpng => thirdparty/libpng}/pngread.c | 0 {libpng => thirdparty/libpng}/pngrio.c | 0 {libpng => thirdparty/libpng}/pngrtran.c | 0 {libpng => thirdparty/libpng}/pngrutil.c | 0 {libpng => thirdparty/libpng}/pngset.c | 0 {libpng => thirdparty/libpng}/pngstruct.h | 0 {libpng => thirdparty/libpng}/pngtrans.c | 0 {libpng => thirdparty/libpng}/pngwio.c | 0 {libpng => thirdparty/libpng}/pngwrite.c | 0 {libpng => thirdparty/libpng}/pngwtran.c | 0 {libpng => thirdparty/libpng}/pngwutil.c | 0 {msvc => thirdparty/msvc}/inttypes.h | 0 {msvc => thirdparty/msvc}/stdbool.h | 0 {msvc => thirdparty/msvc}/stdint.h | 0 {zlib => thirdparty/zlib}/CMakeLists.txt | 0 {zlib => thirdparty/zlib}/ChangeLog | 0 {zlib => thirdparty/zlib}/README | 0 {zlib => thirdparty/zlib}/adler32.c | 0 {zlib => thirdparty/zlib}/compress.c | 0 {zlib => thirdparty/zlib}/crc32.c | 0 {zlib => thirdparty/zlib}/crc32.h | 0 {zlib => thirdparty/zlib}/deflate.c | 0 {zlib => thirdparty/zlib}/deflate.h | 0 {zlib => thirdparty/zlib}/example.c | 0 {zlib => thirdparty/zlib}/gzio.c | 0 {zlib => thirdparty/zlib}/infback.c | 0 {zlib => thirdparty/zlib}/inffast.c | 0 {zlib => thirdparty/zlib}/inffast.h | 0 {zlib => thirdparty/zlib}/inffixed.h | 0 {zlib => thirdparty/zlib}/inflate.c | 0 {zlib => thirdparty/zlib}/inflate.h | 0 {zlib => thirdparty/zlib}/inftrees.c | 0 {zlib => thirdparty/zlib}/inftrees.h | 0 {zlib => thirdparty/zlib}/minigzip.c | 0 {zlib => thirdparty/zlib}/trees.c | 0 {zlib => thirdparty/zlib}/trees.h | 0 {zlib => thirdparty/zlib}/uncompr.c | 0 {zlib => thirdparty/zlib}/zconf.h | 0 {zlib => thirdparty/zlib}/zlib.h | 0 {zlib => thirdparty/zlib}/zutil.c | 0 {zlib => thirdparty/zlib}/zutil.h | 0 63 files changed, 8 insertions(+), 7 deletions(-) rename {glext => thirdparty/glext}/glext.h (100%) rename {glext => thirdparty/glext}/glxext.h (100%) rename {glext => thirdparty/glext}/wglext.h (100%) rename {libpng => thirdparty/libpng}/ANNOUNCE (100%) rename {libpng => thirdparty/libpng}/CHANGES (100%) rename {libpng => thirdparty/libpng}/CMakeLists.txt (100%) rename {libpng => thirdparty/libpng}/LICENSE (100%) rename {libpng => thirdparty/libpng}/README (100%) rename {libpng => thirdparty/libpng}/TODO (100%) rename {libpng => thirdparty/libpng}/libpng.txt (100%) rename {libpng => thirdparty/libpng}/png.c (100%) rename {libpng => thirdparty/libpng}/png.h (100%) rename {libpng => thirdparty/libpng}/pngconf.h (100%) rename {libpng => thirdparty/libpng}/pngdebug.h (100%) rename {libpng => thirdparty/libpng}/pngerror.c (100%) rename {libpng => thirdparty/libpng}/pngget.c (100%) rename {libpng => thirdparty/libpng}/pnginfo.h (100%) rename {libpng => thirdparty/libpng}/pnglibconf.h (100%) rename {libpng => thirdparty/libpng}/pngmem.c (100%) rename {libpng => thirdparty/libpng}/pngpread.c (100%) rename {libpng => thirdparty/libpng}/pngpriv.h (100%) rename {libpng => thirdparty/libpng}/pngread.c (100%) rename {libpng => thirdparty/libpng}/pngrio.c (100%) rename {libpng => thirdparty/libpng}/pngrtran.c (100%) rename {libpng => thirdparty/libpng}/pngrutil.c (100%) rename {libpng => thirdparty/libpng}/pngset.c (100%) rename {libpng => thirdparty/libpng}/pngstruct.h (100%) rename {libpng => thirdparty/libpng}/pngtrans.c (100%) rename {libpng => thirdparty/libpng}/pngwio.c (100%) rename {libpng => thirdparty/libpng}/pngwrite.c (100%) rename {libpng => thirdparty/libpng}/pngwtran.c (100%) rename {libpng => thirdparty/libpng}/pngwutil.c (100%) rename {msvc => thirdparty/msvc}/inttypes.h (100%) rename {msvc => thirdparty/msvc}/stdbool.h (100%) rename {msvc => thirdparty/msvc}/stdint.h (100%) rename {zlib => thirdparty/zlib}/CMakeLists.txt (100%) rename {zlib => thirdparty/zlib}/ChangeLog (100%) rename {zlib => thirdparty/zlib}/README (100%) rename {zlib => thirdparty/zlib}/adler32.c (100%) rename {zlib => thirdparty/zlib}/compress.c (100%) rename {zlib => thirdparty/zlib}/crc32.c (100%) rename {zlib => thirdparty/zlib}/crc32.h (100%) rename {zlib => thirdparty/zlib}/deflate.c (100%) rename {zlib => thirdparty/zlib}/deflate.h (100%) rename {zlib => thirdparty/zlib}/example.c (100%) rename {zlib => thirdparty/zlib}/gzio.c (100%) rename {zlib => thirdparty/zlib}/infback.c (100%) rename {zlib => thirdparty/zlib}/inffast.c (100%) rename {zlib => thirdparty/zlib}/inffast.h (100%) rename {zlib => thirdparty/zlib}/inffixed.h (100%) rename {zlib => thirdparty/zlib}/inflate.c (100%) rename {zlib => thirdparty/zlib}/inflate.h (100%) rename {zlib => thirdparty/zlib}/inftrees.c (100%) rename {zlib => thirdparty/zlib}/inftrees.h (100%) rename {zlib => thirdparty/zlib}/minigzip.c (100%) rename {zlib => thirdparty/zlib}/trees.c (100%) rename {zlib => thirdparty/zlib}/trees.h (100%) rename {zlib => thirdparty/zlib}/uncompr.c (100%) rename {zlib => thirdparty/zlib}/zconf.h (100%) rename {zlib => thirdparty/zlib}/zlib.h (100%) rename {zlib => thirdparty/zlib}/zutil.c (100%) rename {zlib => thirdparty/zlib}/zutil.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f388991..55b530f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ endif (WIN32) if (MSVC) # C99 includes for msvc - include_directories (msvc) + include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/msvc) # Enable math constants defines add_definitions (-D_USE_MATH_DEFINES) @@ -107,8 +107,6 @@ endif () # which subdirectory they are declared set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -include_directories (${CMAKE_CURRENT_SOURCE_DIR}) - ############################################################################## # Bundled dependencies @@ -118,22 +116,25 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}) # - on unices to prevent symbol collisions when tracing applications that link # against other versions of these libraries -set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/zlib) +set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib) set (ZLIB_LIBRARIES z_bundled) -add_subdirectory (zlib EXCLUDE_FROM_ALL) +add_subdirectory (thirdparty/zlib EXCLUDE_FROM_ALL) include_directories (${ZLIB_INCLUDE_DIRS}) link_libraries (${ZLIB_LIBRARIES}) -set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libpng) +set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libpng) set (PNG_DEFINITIONS "") set (PNG_LIBRARIES png_bundled) -add_subdirectory (libpng EXCLUDE_FROM_ALL) +add_subdirectory (thirdparty/libpng EXCLUDE_FROM_ALL) include_directories (${PNG_INCLUDE_DIR}) add_definitions (${PNG_DEFINITIONS}) link_libraries (${PNG_LIBRARIES}) +# For glext headers +include_directories (${CMAKE_CURRENT_SOURCE_DIR}/thirdparty) + ############################################################################## # Common libraries / utilities diff --git a/glext/glext.h b/thirdparty/glext/glext.h similarity index 100% rename from glext/glext.h rename to thirdparty/glext/glext.h diff --git a/glext/glxext.h b/thirdparty/glext/glxext.h similarity index 100% rename from glext/glxext.h rename to thirdparty/glext/glxext.h diff --git a/glext/wglext.h b/thirdparty/glext/wglext.h similarity index 100% rename from glext/wglext.h rename to thirdparty/glext/wglext.h diff --git a/libpng/ANNOUNCE b/thirdparty/libpng/ANNOUNCE similarity index 100% rename from libpng/ANNOUNCE rename to thirdparty/libpng/ANNOUNCE diff --git a/libpng/CHANGES b/thirdparty/libpng/CHANGES similarity index 100% rename from libpng/CHANGES rename to thirdparty/libpng/CHANGES diff --git a/libpng/CMakeLists.txt b/thirdparty/libpng/CMakeLists.txt similarity index 100% rename from libpng/CMakeLists.txt rename to thirdparty/libpng/CMakeLists.txt diff --git a/libpng/LICENSE b/thirdparty/libpng/LICENSE similarity index 100% rename from libpng/LICENSE rename to thirdparty/libpng/LICENSE diff --git a/libpng/README b/thirdparty/libpng/README similarity index 100% rename from libpng/README rename to thirdparty/libpng/README diff --git a/libpng/TODO b/thirdparty/libpng/TODO similarity index 100% rename from libpng/TODO rename to thirdparty/libpng/TODO diff --git a/libpng/libpng.txt b/thirdparty/libpng/libpng.txt similarity index 100% rename from libpng/libpng.txt rename to thirdparty/libpng/libpng.txt diff --git a/libpng/png.c b/thirdparty/libpng/png.c similarity index 100% rename from libpng/png.c rename to thirdparty/libpng/png.c diff --git a/libpng/png.h b/thirdparty/libpng/png.h similarity index 100% rename from libpng/png.h rename to thirdparty/libpng/png.h diff --git a/libpng/pngconf.h b/thirdparty/libpng/pngconf.h similarity index 100% rename from libpng/pngconf.h rename to thirdparty/libpng/pngconf.h diff --git a/libpng/pngdebug.h b/thirdparty/libpng/pngdebug.h similarity index 100% rename from libpng/pngdebug.h rename to thirdparty/libpng/pngdebug.h diff --git a/libpng/pngerror.c b/thirdparty/libpng/pngerror.c similarity index 100% rename from libpng/pngerror.c rename to thirdparty/libpng/pngerror.c diff --git a/libpng/pngget.c b/thirdparty/libpng/pngget.c similarity index 100% rename from libpng/pngget.c rename to thirdparty/libpng/pngget.c diff --git a/libpng/pnginfo.h b/thirdparty/libpng/pnginfo.h similarity index 100% rename from libpng/pnginfo.h rename to thirdparty/libpng/pnginfo.h diff --git a/libpng/pnglibconf.h b/thirdparty/libpng/pnglibconf.h similarity index 100% rename from libpng/pnglibconf.h rename to thirdparty/libpng/pnglibconf.h diff --git a/libpng/pngmem.c b/thirdparty/libpng/pngmem.c similarity index 100% rename from libpng/pngmem.c rename to thirdparty/libpng/pngmem.c diff --git a/libpng/pngpread.c b/thirdparty/libpng/pngpread.c similarity index 100% rename from libpng/pngpread.c rename to thirdparty/libpng/pngpread.c diff --git a/libpng/pngpriv.h b/thirdparty/libpng/pngpriv.h similarity index 100% rename from libpng/pngpriv.h rename to thirdparty/libpng/pngpriv.h diff --git a/libpng/pngread.c b/thirdparty/libpng/pngread.c similarity index 100% rename from libpng/pngread.c rename to thirdparty/libpng/pngread.c diff --git a/libpng/pngrio.c b/thirdparty/libpng/pngrio.c similarity index 100% rename from libpng/pngrio.c rename to thirdparty/libpng/pngrio.c diff --git a/libpng/pngrtran.c b/thirdparty/libpng/pngrtran.c similarity index 100% rename from libpng/pngrtran.c rename to thirdparty/libpng/pngrtran.c diff --git a/libpng/pngrutil.c b/thirdparty/libpng/pngrutil.c similarity index 100% rename from libpng/pngrutil.c rename to thirdparty/libpng/pngrutil.c diff --git a/libpng/pngset.c b/thirdparty/libpng/pngset.c similarity index 100% rename from libpng/pngset.c rename to thirdparty/libpng/pngset.c diff --git a/libpng/pngstruct.h b/thirdparty/libpng/pngstruct.h similarity index 100% rename from libpng/pngstruct.h rename to thirdparty/libpng/pngstruct.h diff --git a/libpng/pngtrans.c b/thirdparty/libpng/pngtrans.c similarity index 100% rename from libpng/pngtrans.c rename to thirdparty/libpng/pngtrans.c diff --git a/libpng/pngwio.c b/thirdparty/libpng/pngwio.c similarity index 100% rename from libpng/pngwio.c rename to thirdparty/libpng/pngwio.c diff --git a/libpng/pngwrite.c b/thirdparty/libpng/pngwrite.c similarity index 100% rename from libpng/pngwrite.c rename to thirdparty/libpng/pngwrite.c diff --git a/libpng/pngwtran.c b/thirdparty/libpng/pngwtran.c similarity index 100% rename from libpng/pngwtran.c rename to thirdparty/libpng/pngwtran.c diff --git a/libpng/pngwutil.c b/thirdparty/libpng/pngwutil.c similarity index 100% rename from libpng/pngwutil.c rename to thirdparty/libpng/pngwutil.c diff --git a/msvc/inttypes.h b/thirdparty/msvc/inttypes.h similarity index 100% rename from msvc/inttypes.h rename to thirdparty/msvc/inttypes.h diff --git a/msvc/stdbool.h b/thirdparty/msvc/stdbool.h similarity index 100% rename from msvc/stdbool.h rename to thirdparty/msvc/stdbool.h diff --git a/msvc/stdint.h b/thirdparty/msvc/stdint.h similarity index 100% rename from msvc/stdint.h rename to thirdparty/msvc/stdint.h diff --git a/zlib/CMakeLists.txt b/thirdparty/zlib/CMakeLists.txt similarity index 100% rename from zlib/CMakeLists.txt rename to thirdparty/zlib/CMakeLists.txt diff --git a/zlib/ChangeLog b/thirdparty/zlib/ChangeLog similarity index 100% rename from zlib/ChangeLog rename to thirdparty/zlib/ChangeLog diff --git a/zlib/README b/thirdparty/zlib/README similarity index 100% rename from zlib/README rename to thirdparty/zlib/README diff --git a/zlib/adler32.c b/thirdparty/zlib/adler32.c similarity index 100% rename from zlib/adler32.c rename to thirdparty/zlib/adler32.c diff --git a/zlib/compress.c b/thirdparty/zlib/compress.c similarity index 100% rename from zlib/compress.c rename to thirdparty/zlib/compress.c diff --git a/zlib/crc32.c b/thirdparty/zlib/crc32.c similarity index 100% rename from zlib/crc32.c rename to thirdparty/zlib/crc32.c diff --git a/zlib/crc32.h b/thirdparty/zlib/crc32.h similarity index 100% rename from zlib/crc32.h rename to thirdparty/zlib/crc32.h diff --git a/zlib/deflate.c b/thirdparty/zlib/deflate.c similarity index 100% rename from zlib/deflate.c rename to thirdparty/zlib/deflate.c diff --git a/zlib/deflate.h b/thirdparty/zlib/deflate.h similarity index 100% rename from zlib/deflate.h rename to thirdparty/zlib/deflate.h diff --git a/zlib/example.c b/thirdparty/zlib/example.c similarity index 100% rename from zlib/example.c rename to thirdparty/zlib/example.c diff --git a/zlib/gzio.c b/thirdparty/zlib/gzio.c similarity index 100% rename from zlib/gzio.c rename to thirdparty/zlib/gzio.c diff --git a/zlib/infback.c b/thirdparty/zlib/infback.c similarity index 100% rename from zlib/infback.c rename to thirdparty/zlib/infback.c diff --git a/zlib/inffast.c b/thirdparty/zlib/inffast.c similarity index 100% rename from zlib/inffast.c rename to thirdparty/zlib/inffast.c diff --git a/zlib/inffast.h b/thirdparty/zlib/inffast.h similarity index 100% rename from zlib/inffast.h rename to thirdparty/zlib/inffast.h diff --git a/zlib/inffixed.h b/thirdparty/zlib/inffixed.h similarity index 100% rename from zlib/inffixed.h rename to thirdparty/zlib/inffixed.h diff --git a/zlib/inflate.c b/thirdparty/zlib/inflate.c similarity index 100% rename from zlib/inflate.c rename to thirdparty/zlib/inflate.c diff --git a/zlib/inflate.h b/thirdparty/zlib/inflate.h similarity index 100% rename from zlib/inflate.h rename to thirdparty/zlib/inflate.h diff --git a/zlib/inftrees.c b/thirdparty/zlib/inftrees.c similarity index 100% rename from zlib/inftrees.c rename to thirdparty/zlib/inftrees.c diff --git a/zlib/inftrees.h b/thirdparty/zlib/inftrees.h similarity index 100% rename from zlib/inftrees.h rename to thirdparty/zlib/inftrees.h diff --git a/zlib/minigzip.c b/thirdparty/zlib/minigzip.c similarity index 100% rename from zlib/minigzip.c rename to thirdparty/zlib/minigzip.c diff --git a/zlib/trees.c b/thirdparty/zlib/trees.c similarity index 100% rename from zlib/trees.c rename to thirdparty/zlib/trees.c diff --git a/zlib/trees.h b/thirdparty/zlib/trees.h similarity index 100% rename from zlib/trees.h rename to thirdparty/zlib/trees.h diff --git a/zlib/uncompr.c b/thirdparty/zlib/uncompr.c similarity index 100% rename from zlib/uncompr.c rename to thirdparty/zlib/uncompr.c diff --git a/zlib/zconf.h b/thirdparty/zlib/zconf.h similarity index 100% rename from zlib/zconf.h rename to thirdparty/zlib/zconf.h diff --git a/zlib/zlib.h b/thirdparty/zlib/zlib.h similarity index 100% rename from zlib/zlib.h rename to thirdparty/zlib/zlib.h diff --git a/zlib/zutil.c b/thirdparty/zlib/zutil.c similarity index 100% rename from zlib/zutil.c rename to thirdparty/zlib/zutil.c diff --git a/zlib/zutil.h b/thirdparty/zlib/zutil.h similarity index 100% rename from zlib/zutil.h rename to thirdparty/zlib/zutil.h -- 2.43.0