Commit a36f32f4 authored by schultz's avatar schultz

disabled pragma based lib loading for freeglut, as it caused problems with

VS2017
parent ffad9831
...@@ -144,6 +144,7 @@ if (WIN32) ...@@ -144,6 +144,7 @@ if (WIN32)
-DUSEACG -DUSEACG
-DPLUGINLIBDLL -DPLUGINLIBDLL
-DUSEPLUGINLIBDLL -DUSEPLUGINLIBDLL
-DFREEGLUT_LIB_PRAGMAS=0
) )
endif () endif ()
......
...@@ -63,6 +63,7 @@ if (WIN32) ...@@ -63,6 +63,7 @@ if (WIN32)
-DPLUGINLIBDLL -DPLUGINLIBDLL
-DACGDLL -DACGDLL
-DUSEACG -DUSEACG
-DFREEGLUT_LIB_PRAGMAS=0
) )
endif () endif ()
......
...@@ -695,7 +695,7 @@ function (_build_openflipper_plugin plugin) ...@@ -695,7 +695,7 @@ function (_build_openflipper_plugin plugin)
# Visual studio requires our plugins to link with GLUT # Visual studio requires our plugins to link with GLUT
find_package (GLUT) find_package (GLUT)
# generate dllinport defines # generate dllinport defines
add_definitions (-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL) add_definitions (-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL -DFREEGLUT_LIB_PRAGMAS=0)
target_link_libraries (Plugin-${plugin} target_link_libraries (Plugin-${plugin}
${OPENMESH_LIBRARIES} ${OPENMESH_LIBRARIES}
ACG ACG
......
...@@ -29,6 +29,7 @@ if (WIN32) ...@@ -29,6 +29,7 @@ if (WIN32)
-DBUILDOBJECTTYPEDLL -DBUILDOBJECTTYPEDLL
-DACGDLL -DACGDLL
-DUSEACG -DUSEACG
-DFREEGLUT_LIB_PRAGMAS=0
) )
endif () endif ()
......
...@@ -101,7 +101,7 @@ set (directories ...@@ -101,7 +101,7 @@ set (directories
# generate dllexport macros on windows # generate dllexport macros on windows
if (WIN32) if (WIN32)
add_definitions(-DACGDLL) add_definitions(-DACGDLL -DFREEGLUT_LIB_PRAGMAS=0)
remove_definitions(-DUSEACG) remove_definitions(-DUSEACG)
endif () endif ()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment