From 41ee6724e82c26ca12c0415094eec8ed21e77814 Mon Sep 17 00:00:00 2001 From: Ciprian Date: Fri, 25 Dec 2020 21:51:21 -0800 Subject: [PATCH] * Finalized removal of GLUT --- CMakeLists.txt | 5 +---- src/main.hpp | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index edd09131c..b5a9a38bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -332,9 +332,6 @@ elseif (APPLE) include_directories("${PROJECT_SOURCE_DIR}/libraries/fmod/inc") link_directories("${PROJECT_SOURCE_DIR}/libraries/fmod/lib") endif() - - find_package(GLUT REQUIRED) - include_directories(${GLUT_INCLUDE_DIR}) endif() # Add the source directory @@ -444,7 +441,7 @@ if (GAME_ENABLED) target_link_libraries(barony ${EOS_LIBRARIES}) endif() if (APPLE) - target_link_libraries(barony ${GLUT_LIBRARIES} ${PROJECT_SOURCE_DIR}/libpng16.16.dylib) #Wait...what? if(APPLE) in if(WIN32)? What was I thinking back then, haha. + target_link_libraries(barony ${PROJECT_SOURCE_DIR}/libpng16.16.dylib) #Wait...what? if(APPLE) in if(WIN32)? What was I thinking back then, haha. endif() if (${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") # For backtrace diff --git a/src/main.hpp b/src/main.hpp index 946e87ade..f2bd65373 100644 --- a/src/main.hpp +++ b/src/main.hpp @@ -109,7 +109,6 @@ extern bool autoLimbReload; #include //#include #define GL_GLEXT_PROTOTYPES - #include #include #include #include