Renamed all osgsimpleviewer* files to osgviewer*
This commit is contained in:
parent
33b6fdd6c6
commit
0ab50f6100
@ -1,7 +1,7 @@
|
|||||||
SET(TARGET_SRC osgsimpleviewerFLTK.cpp )
|
SET(TARGET_SRC osgviewerFLTK.cpp )
|
||||||
|
|
||||||
SET(TARGET_ADDED_LIBRARIES ${FLTK_LIBRARIES} )
|
SET(TARGET_ADDED_LIBRARIES ${FLTK_LIBRARIES} )
|
||||||
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
|
INCLUDE_DIRECTORIES(${FLTK_INCLUDE_DIR} )
|
||||||
|
|
||||||
#### end var setup ###
|
#### end var setup ###
|
||||||
SETUP_EXAMPLE(osgsimpleviewerFLTK)
|
SETUP_EXAMPLE(osgviewerFLTK)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
SET(TARGET_SRC osgsimpleviewerGLUT.cpp )
|
SET(TARGET_SRC osgviewerGLUT.cpp )
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} )
|
INCLUDE_DIRECTORIES( ${GLUT_INCLUDE_DIR} )
|
||||||
SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY )
|
SET(TARGET_LIBRARIES_VARS GLUT_glut_LIBRARY )
|
||||||
|
|
||||||
#### end var setup ###
|
#### end var setup ###
|
||||||
SETUP_EXAMPLE(osgsimpleviewerGLUT)
|
SETUP_EXAMPLE(osgviewerGLUT)
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
SET(TARGET_SRC osgsimpleviewerQT3.cpp )
|
SET(TARGET_SRC osgviewerQT3.cpp )
|
||||||
|
|
||||||
SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} )
|
SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} )
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} )
|
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} )
|
||||||
|
|
||||||
#### end var setup ###
|
#### end var setup ###
|
||||||
SETUP_EXAMPLE(osgsimpleviewerQT3)
|
SETUP_EXAMPLE(osgviewerQT3)
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
SET(QT_USE_QTOPENGL yes)
|
SET(QT_USE_QTOPENGL yes)
|
||||||
INCLUDE(UseQt4)
|
INCLUDE(UseQt4)
|
||||||
|
|
||||||
SET(TARGET_SRC osgsimpleviewerQT4.cpp )
|
SET(TARGET_SRC osgviewerQT4.cpp )
|
||||||
|
|
||||||
SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} )
|
SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} )
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} )
|
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} )
|
||||||
|
|
||||||
#### end var setup ###
|
#### end var setup ###
|
||||||
SETUP_EXAMPLE(osgsimpleviewerQT4)
|
SETUP_EXAMPLE(osgviewerQT4)
|
||||||
|
@ -1,16 +1,16 @@
|
|||||||
IF("${SDL_LIBRARY}" MATCHES "SDLmain")
|
IF("${SDL_LIBRARY}" MATCHES "SDLmain")
|
||||||
# Found a precompiled SDLmain library.
|
# Found a precompiled SDLmain library.
|
||||||
SET(TARGET_SRC osgsimpleviewerSDL.cpp)
|
SET(TARGET_SRC osgviewerSDL.cpp)
|
||||||
ELSE("${SDL_LIBRARY}" MATCHES "SDLmain")
|
ELSE("${SDL_LIBRARY}" MATCHES "SDLmain")
|
||||||
# No SDLmain has been found.
|
# No SDLmain has been found.
|
||||||
# Depending on platform, code may need to be provided for SDLmain.
|
# Depending on platform, code may need to be provided for SDLmain.
|
||||||
IF(APPLE)
|
IF(APPLE)
|
||||||
SET(TARGET_SRC osgsimpleviewerSDL.cpp SDLMainForMacOSX.m SDLMainForMacOSX.h)
|
SET(TARGET_SRC osgviewerSDL.cpp SDLMainForMacOSX.m SDLMainForMacOSX.h)
|
||||||
ELSE(APPLE)
|
ELSE(APPLE)
|
||||||
# Unhandled case. No libsdlmain has been found and no code substitute.
|
# Unhandled case. No libsdlmain has been found and no code substitute.
|
||||||
# Depending on platform (or SDL version),
|
# Depending on platform (or SDL version),
|
||||||
# this may or may not link successfully.
|
# this may or may not link successfully.
|
||||||
SET(TARGET_SRC osgsimpleviewerSDL.cpp)
|
SET(TARGET_SRC osgviewerSDL.cpp)
|
||||||
ENDIF(APPLE)
|
ENDIF(APPLE)
|
||||||
ENDIF("${SDL_LIBRARY}" MATCHES "SDLmain")
|
ENDIF("${SDL_LIBRARY}" MATCHES "SDLmain")
|
||||||
|
|
||||||
@ -19,5 +19,5 @@ SET(TARGET_EXTERNAL_LIBRARIES ${SDL_LIBRARY} )
|
|||||||
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} )
|
INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} )
|
||||||
|
|
||||||
#### end var setup ###
|
#### end var setup ###
|
||||||
SETUP_EXAMPLE(osgsimpleviewerSDL)
|
SETUP_EXAMPLE(osgviewerSDL)
|
||||||
|
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
SET(TARGET_SRC osgsimpleviewerWX.cpp )
|
SET(TARGET_SRC osgviewerWX.cpp )
|
||||||
|
|
||||||
SET(TARGET_H osgsimpleviewerWX.h )
|
SET(TARGET_H osgviewerWX.h )
|
||||||
|
|
||||||
INCLUDE(${wxWidgets_USE_FILE})
|
INCLUDE(${wxWidgets_USE_FILE})
|
||||||
|
|
||||||
#### end var setup ###
|
#### end var setup ###
|
||||||
|
|
||||||
SET(REQUIRE_WINMAIN_FLAG ON)
|
SET(REQUIRE_WINMAIN_FLAG ON)
|
||||||
SETUP_EXAMPLE(osgsimpleviewerWX)
|
SETUP_EXAMPLE(osgviewerWX)
|
||||||
|
|
||||||
TARGET_LINK_LIBRARIES("${TARGET_DEFAULT_PREFIX}osgsimpleviewerWX" ${wxWidgets_LIBRARIES})
|
TARGET_LINK_LIBRARIES("${TARGET_DEFAULT_PREFIX}osgviewerWX" ${wxWidgets_LIBRARIES})
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include "wx/wx.h"
|
#include "wx/wx.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "osgsimpleviewerWX.h"
|
#include "osgviewerWX.h"
|
||||||
#include <osgGA/TrackballManipulator>
|
#include <osgGA/TrackballManipulator>
|
||||||
#include <osgDB/ReadFile>
|
#include <osgDB/ReadFile>
|
||||||
#include <wx/image.h>
|
#include <wx/image.h>
|
Loading…
Reference in New Issue
Block a user