FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Mattias Helsing, "When building osg static on Windows the _declspec's wasn't escaped for

Browse Source 
applications, examples or wrappers. Attached are the CMakeLists I had
to change to make these compile.
"
This commit is contained in:
Robert Osfield 2008-12-11 17:00:40 +00:00
parent 3a623717a9
commit 4896fe6e05
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
applications/CMakeLists.txt
View File

@ -1,5 +1,10 @@
PROJECT(OSG_APPLICATIONS) 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) SET(OSGCORE_BUNDLED TRUE)
IF(NOT OSGCORE_BUNDLED) IF(NOT OSGCORE_BUNDLED)

2
examples/CMakeLists.txt
View File

@ -193,6 +193,8 @@ IF(DYNAMIC_OPENSCENEGRAPH)
#to add subject to find socket#ADD_SUBDIRECTORY(osgcluster) #to add subject to find socket#ADD_SUBDIRECTORY(osgcluster)
ELSE(DYNAMIC_OPENSCENEGRAPH) ELSE(DYNAMIC_OPENSCENEGRAPH)
#needed on win32 or the linker get confused by _declspec declarations
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
ADD_SUBDIRECTORY(osgstaticviewer) ADD_SUBDIRECTORY(osgstaticviewer)

3
src/osgPlugins/CMakeLists.txt
View File

@ -6,6 +6,9 @@
PROJECT(OSG_PLUGINS_MASTER) PROJECT(OSG_PLUGINS_MASTER)
IF (NOT DYNAMIC_OPENSCENEGRAPH)
ADD_DEFINITIONS(-DOSG_LIBRARY_STATIC)
ENDIF(NOT DYNAMIC_OPENSCENEGRAPH)
IF(NOT MSVC) IF(NOT MSVC)
SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}") SET(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")

4
src/osgWrappers/CMakeLists.txt
View File

@ -1,5 +1,9 @@
PROJECT(OSG_WRAPPERS) 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(LIBRARY_OUTPUT_PATH "${LIBRARY_OUTPUT_PATH}/${OSG_PLUGINS}")
SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX}) SET(CMAKE_SHARED_MODULE_PREFIX ${OSG_PLUGIN_PREFIX})