iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Fix build with SDL 1

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6130 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: c55339ed323290cb3aba7f0a91a4a81893436376
Former-commit-id: 8ddaf26b3104816f6fb5a3a3d192b62c22d97830
This commit is contained in:
beaglejoe 2015-09-16 02:08:10 +00:00
parent ebe8ce502a
commit dcf1cf6a5b
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/modules/graphic/osggraph/CMakeLists.txt
View file

@ -24,8 +24,6 @@ SET(OSGGRAPH_HEADERS Utils/OsgVectorArrayAdapter.h
Render/OsgRender.h Render/OsgRender.h
Render/OsgReflectionMapping.h Render/OsgReflectionMapping.h
Render/OsgShader.h Render/OsgShader.h
Viewer/OsgGraphicsWindow.h
Viewer/OsgView.h Viewer/OsgView.h
Viewer/OsgScreens.h Viewer/OsgScreens.h
Viewer/OsgCamera.h Viewer/OsgCamera.h
@ -40,6 +38,10 @@ SET(OSGGRAPH_HEADERS Utils/OsgVectorArrayAdapter.h
OsgMain.h OsgMain.h
) )
IF(OPTION_SDL2)
SET(OSGGRAPH_HEADERS ${OSGGRAPH_HEADERS} Viewer/OsgGraphicsWindow.h)
ENDIF(OPTION_SDL2)
SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp
#Utils/OsgOptions.cpp #Utils/OsgOptions.cpp
@ -64,8 +66,6 @@ SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp
Render/OsgRender.cpp Render/OsgRender.cpp
Render/OsgReflectionMapping.cpp Render/OsgReflectionMapping.cpp
Render/OsgShader.cpp Render/OsgShader.cpp
Viewer/OsgGraphicsWindow.cpp
Viewer/OsgView.cpp Viewer/OsgView.cpp
Viewer/OsgScreens.cpp Viewer/OsgScreens.cpp
Viewer/OsgCamera.cpp Viewer/OsgCamera.cpp
@ -80,6 +80,10 @@ SET(OSGGRAPH_SOURCES Utils/OsgMath.cpp
OsgMain.cpp OsgMain.cpp
) )
IF(OPTION_SDL2)
SET(OSGGRAPH_SOURCES ${OSGGRAPH_SOURCES} Viewer/OsgGraphicsWindow.cpp)
ENDIF(OPTION_SDL2)
INCLUDE_DIRECTORIES(Utils Sky Loader Scenery Render Viewer Car .) INCLUDE_DIRECTORIES(Utils Sky Loader Scenery Render Viewer Car .)
ADD_INTERFACE_INCLUDEDIR() ADD_INTERFACE_INCLUDEDIR()

2
src/modules/graphic/osggraph/Viewer/OsgScreens.cpp
View file

@ -26,7 +26,9 @@
#include <osg/FrontFace> #include <osg/FrontFace>
#include "OsgScreens.h" #include "OsgScreens.h"
#if SDL_MAJOR_VERSION >= 2
#include "OsgGraphicsWindow.h" #include "OsgGraphicsWindow.h"
#endif
#include "OsgDebugHUD.h" #include "OsgDebugHUD.h"
#include "OsgReflectionMapping.h" #include "OsgReflectionMapping.h"
#include "OsgMain.h" #include "OsgMain.h"