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

From Luigi Calori, build fixes for Win32 build osg WxWidgets example

Browse Source
This commit is contained in:
Robert Osfield 2007-05-25 13:15:00 +00:00
parent 74d19eed34
commit 32931f90a8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeModules/OsgMacroUtils.cmake
View File

@ -152,8 +152,11 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
ENDIF(NOT TARGET_LABEL) ENDIF(NOT TARGET_LABEL)
IF(${IS_COMMANDLINE_APP}) IF(${IS_COMMANDLINE_APP})
ADD_EXECUTABLE(${TARGET_TARGETNAME} ${TARGET_SRC} ${TARGET_H}) ADD_EXECUTABLE(${TARGET_TARGETNAME} ${TARGET_SRC} ${TARGET_H})
ELSE(${IS_COMMANDLINE_APP}) ELSE(${IS_COMMANDLINE_APP})
IF(APPLE) IF(APPLE)
# SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}") # SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}")
# Short Version is the "marketing version". It is the version # Short Version is the "marketing version". It is the version
@ -168,7 +171,12 @@ MACRO(SETUP_EXE IS_COMMANDLINE_APP)
# SET(MACOSX_BUNDLE_INFO_STRING "Info string, localized?") # SET(MACOSX_BUNDLE_INFO_STRING "Info string, localized?")
ENDIF(APPLE) ENDIF(APPLE)
IF(WIN32 AND REQUIRE_WINMAIN_FLAG)
ADD_EXECUTABLE(${TARGET_TARGETNAME} WIN32 ${TARGET_SRC} ${TARGET_H})
ELSE(WIN32 AND REQUIRE_WINMAIN_FLAG)
ADD_EXECUTABLE(${TARGET_TARGETNAME} MACOSX_BUNDLE ${TARGET_SRC} ${TARGET_H}) ADD_EXECUTABLE(${TARGET_TARGETNAME} MACOSX_BUNDLE ${TARGET_SRC} ${TARGET_H})
ENDIF(WIN32 AND REQUIRE_WINMAIN_FLAG)
ENDIF(${IS_COMMANDLINE_APP}) ENDIF(${IS_COMMANDLINE_APP})
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}")
SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})

3
examples/osgsimpleviewerWX/CMakeLists.txt
View File

@ -6,6 +6,7 @@ INCLUDE(${wxWidgets_USE_FILE})
#### end var setup ### #### end var setup ###
SETUP_EXAMPLE(osgsimpleviewerWX 1) SET(REQUIRE_WINMAIN_FLAG ON)
SETUP_EXAMPLE(osgsimpleviewerWX)
TARGET_LINK_LIBRARIES("${TARGET_DEFAULT_PREFIX}osgsimpleviewerWX" ${wxWidgets_LIBRARIES}) TARGET_LINK_LIBRARIES("${TARGET_DEFAULT_PREFIX}osgsimpleviewerWX" ${wxWidgets_LIBRARIES})