Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
a36f32f4
Commit
a36f32f4
authored
May 16, 2018
by
schultz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disabled pragma based lib loading for freeglut, as it caused problems with
VS2017
parent
ffad9831
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
2 deletions
+5
-2
CoreApp/CMakeLists.txt
CoreApp/CMakeLists.txt
+1
-0
PluginLib/CMakeLists.txt
PluginLib/CMakeLists.txt
+1
-0
cmake/plugin.cmake
cmake/plugin.cmake
+1
-1
cmake/type.cmake
cmake/type.cmake
+1
-0
libs_required/ACG/CMakeLists.txt
libs_required/ACG/CMakeLists.txt
+1
-1
No files found.
CoreApp/CMakeLists.txt
View file @
a36f32f4
...
...
@@ -144,6 +144,7 @@ if (WIN32)
-DUSEACG
-DPLUGINLIBDLL
-DUSEPLUGINLIBDLL
-DFREEGLUT_LIB_PRAGMAS=0
)
endif
()
...
...
PluginLib/CMakeLists.txt
View file @
a36f32f4
...
...
@@ -63,6 +63,7 @@ if (WIN32)
-DPLUGINLIBDLL
-DACGDLL
-DUSEACG
-DFREEGLUT_LIB_PRAGMAS=0
)
endif
()
...
...
cmake/plugin.cmake
View file @
a36f32f4
...
...
@@ -695,7 +695,7 @@ function (_build_openflipper_plugin plugin)
# Visual studio requires our plugins to link with GLUT
find_package
(
GLUT
)
# generate dllinport defines
add_definitions
(
-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL
)
add_definitions
(
-DACGDLL -DUSEACG -DPLUGINLIBDLL -DUSEPLUGINLIBDLL
-DFREEGLUT_LIB_PRAGMAS=0
)
target_link_libraries
(
Plugin-
${
plugin
}
${
OPENMESH_LIBRARIES
}
ACG
...
...
cmake/type.cmake
View file @
a36f32f4
...
...
@@ -29,6 +29,7 @@ if (WIN32)
-DBUILDOBJECTTYPEDLL
-DACGDLL
-DUSEACG
-DFREEGLUT_LIB_PRAGMAS=0
)
endif
()
...
...
libs_required/ACG/CMakeLists.txt
View file @
a36f32f4
...
...
@@ -101,7 +101,7 @@ set (directories
# generate dllexport macros on windows
if
(
WIN32
)
add_definitions
(
-DACGDLL
)
add_definitions
(
-DACGDLL
-DFREEGLUT_LIB_PRAGMAS=0
)
remove_definitions
(
-DUSEACG
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment