diff options
| author | Stephan Vedder <stephan.vedder@gmail.com> | 2022-05-02 08:56:36 +0300 |
|---|---|---|
| committer | Stephan Vedder <stephan.vedder@gmail.com> | 2022-05-02 08:56:36 +0300 |
| commit | 3d6c8971bfa7abe0c2acde4a67db8dce24728adb (patch) | |
| tree | df35e9d00b7eba4d5c470b2c549256b0c61827af /Projects | |
| parent | 0d9f5b2faafecf26c50647753ca2c56296b9da35 (diff) | |
Remove GLEW for GLAD
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | Projects/glew/CMakeLists.txt | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/Projects/CMakeLists.txt b/Projects/CMakeLists.txt index 5be55093..938d5618 100644 --- a/Projects/CMakeLists.txt +++ b/Projects/CMakeLists.txt @@ -280,6 +280,7 @@ SET(BUILD_TESTS OFF CACHE BOOL "" FORCE) #Create subprojects that have their own CMakeLists ADD_SUBDIRECTORY(../Libraries/crunch-r319 crnlib) +ADD_SUBDIRECTORY(../Libraries/glad glad) ADD_SUBDIRECTORY(../Libraries/zstd-1.5.0/build/cmake zstd) IF(BUILD_OVERGROWTH) @@ -289,7 +290,6 @@ IF(BUILD_OVERGROWTH) ADD_SUBDIRECTORY(murmurhash3 murmurhash3) ADD_SUBDIRECTORY(binn binn) ADD_SUBDIRECTORY(TheoraPlayer TheoraPlayer) - ADD_SUBDIRECTORY(glew glew) ADD_SUBDIRECTORY(recastnavigation recastnavigation) # disable all demos # enable USE_MSVC_RUNTIME_LIBRARY_DLL @@ -314,7 +314,7 @@ IF(BUILD_OVERGROWTH) SET_PROPERTY(TARGET triangle PROPERTY FOLDER "Support") SET_PROPERTY(TARGET minizip PROPERTY FOLDER "Support") SET_PROPERTY(TARGET TheoraPlayer PROPERTY FOLDER "Support") - SET_PROPERTY(TARGET glew PROPERTY FOLDER "Support") + SET_PROPERTY(TARGET glad PROPERTY FOLDER "Support") SET_PROPERTY(TARGET BulletCollision PROPERTY FOLDER "Support/BulletPhysics") SET_PROPERTY(TARGET BulletDynamics PROPERTY FOLDER "Support/BulletPhysics") SET_PROPERTY(TARGET BulletFileLoader PROPERTY FOLDER "Support/BulletPhysics") @@ -630,7 +630,6 @@ ENDIF() ADD_DEFINITIONS( -DHAVE_MIXCFG_H - -DGLEW_STATIC -DTIXML_USE_STL -DIMGUI_ENABLE_FREETYPE ) @@ -648,7 +647,6 @@ INCLUDE_DIRECTORIES( ${LIBDIR}/ovr_sdk_win_1.12.0_public/OculusSDK/LibOVR/Include ${LIBDIR}/openvr-master/headers ${LIBDIR}/glm-0.9.4.2/ - ${LIBDIR}/glew-2.0.0/include bullet3-2.89/src angelscript_2_32_0_sdk/angelscript/include angelscript_2_32_0_sdk @@ -937,6 +935,7 @@ IF(LINUX AND BUILD_OGDA) #Making Ogda linux only for now. freeimage pthread crnlib + glad ) IF(WIN32) @@ -1354,6 +1353,7 @@ IF(BUILD_OVERGROWTH) tinyxml trex logging + glad crnlib ) @@ -1511,7 +1511,7 @@ IF(BUILD_OVERGROWTH) SET_PROPERTY(TARGET triangle PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") SET_PROPERTY(TARGET minizip PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") SET_PROPERTY(TARGET TheoraPlayer PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") - SET_PROPERTY(TARGET glew PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") + SET_PROPERTY(TARGET glad PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") SET_PROPERTY(TARGET trex PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") SET_PROPERTY(TARGET BulletCollision PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") SET_PROPERTY(TARGET BulletDynamics PROPERTY COMPILE_FLAGS "${EXTERNAL_LIB_COMPILE_FLAGS}") @@ -1543,7 +1543,7 @@ IF(BUILD_OVERGROWTH) minizip murmurhash3 binn - glew + glad TheoraPlayer freeimage triangle diff --git a/Projects/glew/CMakeLists.txt b/Projects/glew/CMakeLists.txt deleted file mode 100644 index 0c8f8abb..00000000 --- a/Projects/glew/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -cmake_minimum_required(VERSION 2.6.0) -project(glew) - -set(libdir "${CMAKE_SOURCE_DIR}/../Libraries") - -include_directories(${libdir}/glew-2.0.0/include) -add_definitions(-DGLEW_STATIC) - -add_library(glew STATIC ${libdir}/glew-2.0.0/src/glew.c) |