Просмотр исходного кода

Build static versions of PolycodeLua, 2DPhysics and 3DPhysics modules - with some assumptions on where to find Box2D and Bullet.

Cameron Hart 14 лет назад
Родитель
Сommit
3be9f60f6d

+ 18 - 0
Bindings/Contents/CMakeLists.txt

@@ -0,0 +1,18 @@
+SET(polycodeLua_SRCS
+    LUA/Source/PolycodeLUA.cpp
+)
+
+SET(polycodeLua_HDRS
+    LUA/Include/PolycodeLUAWrappers.h
+    LUA/Include/PolycodeLUA.h
+    LUA/Include/PolycodeLUA2D.h
+)
+
+INCLUDE_DIRECTORIES(
+    ${LUA_INCLUDE_DIR}
+    LUA/Include
+)
+
+ADD_LIBRARY(PolycodeLua SHARED ${polycodeLua_SRCS} ${polycodeLua_HDRS})
+ADD_LIBRARY(PolycodeLuaStatic ${polycodeLua_SRCS} ${polycodeLua_HDRS})
+

+ 22 - 0
CMakeLists.txt

@@ -14,5 +14,27 @@ IF(MSVC)
 	ENDIF(USE_MSVC_FAST_FLOATINGPOINT)
 ENDIF(MSVC)
 
+FIND_PACKAGE(OpenGL REQUIRED)
+FIND_PACKAGE(OpenAL REQUIRED)
+FIND_PACKAGE(Freetype REQUIRED)
+FIND_PACKAGE(PNG REQUIRED)
+FIND_PACKAGE(SDL REQUIRED)
+FIND_PACKAGE(Lua51)
+
+FIND_LIBRARY(VORBISFILE_LIBRARY NAMES vorbisfile)
+
+ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES ${PNG_DEFINITIONS})
+
+INCLUDE_DIRECTORIES(
+    ${OPENGL_INCLUDE_DIR}
+    ${FREETYPE_INCLUDE_DIRS}
+    ${PolyCode_SOURCE_DIR}/Core/Build/Linux
+    ${PolyCode_SOURCE_DIR}/Core/Contents/Include
+)
+
+ADD_SUBDIRECTORY(Bindings/Contents)
 ADD_SUBDIRECTORY(Core/Contents)
 ADD_SUBDIRECTORY(Examples/C++)
+ADD_SUBDIRECTORY(Modules/Contents)
+ADD_SUBDIRECTORY(Player/Contents)
+ADD_SUBDIRECTORY(Tools/Contents)

+ 0 - 17
Core/Contents/CMakeLists.txt

@@ -1,7 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-PROJECT(PolyCore)
-
 SET(polycore_SRCS
     ../Build/Linux/PolycodeView.cpp
     Source/OSBasics.cpp
@@ -200,19 +196,6 @@ SET(polycore_HDRS
     Include/tinyxml.h
 )
 
-FIND_PACKAGE(OpenGL REQUIRED)
-FIND_PACKAGE(Freetype REQUIRED)
-FIND_PACKAGE(PNG REQUIRED)
-FIND_PACKAGE(PhysFS REQUIRED)
-#FIND_PACKAGE(Vorbis REQUIRED)
-
-ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES ${PNG_DEFINITIONS})
-
-INCLUDE_DIRECTORIES(Include
-	${OPENGL_INCLUDE_DIR}
-	${FREETYPE_INCLUDE_DIRS}
-)
-
 #ADD_LIBRARY(PolyCore SHARED ${polycore_SRCS} ${polycore_HDRS})
 ADD_LIBRARY(PolyCoreStatic ${polycore_SRCS} ${polycore_HDRS})
 

+ 0 - 19
Examples/C++/CMakeLists.txt

@@ -1,22 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-
-FIND_PACKAGE(OpenGL REQUIRED)
-FIND_PACKAGE(OpenAL REQUIRED)
-FIND_PACKAGE(Freetype REQUIRED)
-FIND_PACKAGE(PNG REQUIRED)
-FIND_PACKAGE(SDL REQUIRED)
-
-FIND_LIBRARY(VORBISFILE_LIBRARY NAMES vorbisfile)
-
-ADD_DEFINITIONS(-DGL_GLEXT_PROTOTYPES ${PNG_DEFINITIONS})
-
-INCLUDE_DIRECTORIES(
-    ${OPENGL_INCLUDE_DIR}
-    ${FREETYPE_INCLUDE_DIRS}
-    ${PolyCode_SOURCE_DIR}/Core/Build/Linux
-    ${PolyCode_SOURCE_DIR}/Core/Contents/Include
-)
-
 LINK_LIBRARIES(
     PolyCoreStatic
     ${SDL_LIBRARY}

+ 0 - 0
IDE/Contents/CMakeLists.txt


+ 18 - 0
Modules/Contents/2DPhysics/CMakeLists.txt

@@ -0,0 +1,18 @@
+SET(polycode2DPhysics_SRCS
+    Source/PolyPhysicsScreen.cpp
+    Source/PolyPhysicsScreenEntity.cpp
+)
+
+SET(polycode2DPhysics_HDRS
+    Include/Polycode2DPhysics.h
+    Include/PolyPhysicsScreenEntity.h
+    Include/PolyPhysicsScreen.h
+)
+
+INCLUDE_DIRECTORIES(
+    Include
+)
+
+ADD_LIBRARY(Polycode2DPhysics SHARED ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+ADD_LIBRARY(Polycode2DPhysicsStatic ${polycode2DPhysics_SRCS} ${polycode2DPhysics_HDRS})
+

+ 23 - 0
Modules/Contents/3DPhysics/CMakeLists.txt

@@ -0,0 +1,23 @@
+SET(polycode3DPhysics_SRCS
+    Source/PolyPhysicsSceneEntity.cpp
+    Source/PolyPhysicsScene.cpp
+    Source/PolyCollisionSceneEntity.cpp
+    Source/PolyCollisionScene.cpp
+)
+
+SET(polycode3DPhysics_HDRS
+    Include/PolyPhysicsSceneEntity.h
+    Include/Polycode3DPhysics.h
+    Include/PolyCollisionScene.h
+    Include/PolyPhysicsScene.h
+    Include/PolyCollisionSceneEntity.h
+)
+
+INCLUDE_DIRECTORIES(
+    ../../Dependencies/Include/Bullet
+    Include
+)
+
+#ADD_LIBRARY(Polycode3DPhysics SHARED ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+ADD_LIBRARY(Polycode3DPhysicsStatic ${polycode3DPhysics_SRCS} ${polycode3DPhysics_HDRS})
+

+ 4 - 0
Modules/Contents/CMakeLists.txt

@@ -0,0 +1,4 @@
+INCLUDE_DIRECTORIES(../Dependencies/Include)
+
+ADD_SUBDIRECTORY(2DPhysics)
+ADD_SUBDIRECTORY(3DPhysics)

+ 0 - 0
Player/Contents/CMakeLists.txt


+ 0 - 0
Tools/Contents/CMakeLists.txt