diff --git a/CMakeLists.txt b/CMakeLists.txt index f40b9b01f9b..b53038a2142 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -912,6 +912,10 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}) add_library(supertux2_c OBJECT ${SUPERTUX_SOURCES_C}) add_library(supertux2_lib STATIC ${CMAKE_BINARY_DIR}/version.h ${SUPERTUX_SOURCES_CXX} ${SUPERTUX_RESOURCES} $) + +target_link_libraries(supertux2_lib PUBLIC glm::glm) +target_compile_definitions(supertux2_lib PUBLIC -DGLM_ENABLE_EXPERIMENTAL) + if(WIN32) add_executable(supertux2 WIN32 src/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.rc) target_link_libraries(supertux2 ${SDL2MAIN_LIBRARIES}) @@ -919,7 +923,7 @@ else() add_executable(supertux2 src/main.cpp) endif(WIN32) target_link_libraries(supertux2 supertux2_lib Boost::filesystem Boost::locale) -target_link_libraries(supertux2 glm::glm) + set_target_properties(supertux2_lib PROPERTIES OUTPUT_NAME supertux2_lib) set_target_properties(supertux2_lib PROPERTIES COMPILE_FLAGS "${SUPERTUX2_EXTRA_WARNING_FLAGS}") if(EMSCRIPTEN) diff --git a/src/math/vector.hpp b/src/math/vector.hpp index 078b77302fc..e84c2f1a589 100644 --- a/src/math/vector.hpp +++ b/src/math/vector.hpp @@ -16,9 +16,6 @@ #ifndef HEADER_SUPERTUX_MATH_VECTOR_HPP #define HEADER_SUPERTUX_MATH_VECTOR_HPP -#if defined(__arm__) && !defined(__ANDROID__) -#define GLM_ENABLE_EXPERIMENTAL -#endif #include #include @@ -26,7 +23,6 @@ #include #include - using Vector = glm::vec2; namespace math {