From Mattias Helsing, "When building osg static on Windows the _declspec's wasn't escaped for
applications, examples or wrappers. Attached are the CMakeLists I had to change to make these compile. "
This commit is contained in:
parent
3a623717a9
commit
4896fe6e05
@ -1,5 +1,10 @@
|
||||
PROJECT(OSG_APPLICATIONS)
|
||||
|
||||
IF (NOT DYNAMIC_OPENSCENEGRAPH)
|
||||
# need to define this on win32 or linker cries about _declspecs
|
||||
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
|
||||
ENDIF(NOT DYNAMIC_OPENSCENEGRAPH)
|
||||
|
||||
SET(OSGCORE_BUNDLED TRUE)
|
||||
|
||||
IF(NOT OSGCORE_BUNDLED)
|
||||
|
@ -193,6 +193,8 @@ IF(DYNAMIC_OPENSCENEGRAPH)
|
||||
#to add subject to find socket#ADD_SUBDIRECTORY(osgcluster)
|
||||
|
||||
ELSE(DYNAMIC_OPENSCENEGRAPH)
|
||||
#needed on win32 or the linker get confused by _declspec declarations
|
||||
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
|
||||
|
||||
ADD_SUBDIRECTORY(osgstaticviewer)
|
||||
|
||||
|
@ -6,6 +6,9 @@
|
||||
|
||||
PROJECT(OSG_PLUGINS_MASTER)
|
||||
|
||||
IF (NOT DYNAMIC_OPENSCENEGRAPH)
|
||||
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
|
||||
ENDIF(NOT DYNAMIC_OPENSCENEGRAPH)
|
||||
|
||||
IF(NOT MSVC)
|
||||
SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
|
||||
|
@ -1,5 +1,9 @@
|
||||
PROJECT(OSG_WRAPPERS)
|
||||
|
||||
IF (NOT DYNAMIC_OPENSCENEGRAPH)
|
||||
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
|
||||
ENDIF(NOT DYNAMIC_OPENSCENEGRAPH)
|
||||
|
||||
SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
|
||||
|
||||
SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX})
|
||||
|
Loading…
Reference in New Issue
Block a user