Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added Linux 32-bit libs and encoder

  • Loading branch information...
commit 09e3f89c2af88007440b7842c363c892a154cdd0 1 parent 2428371
@seanpaultaylor seanpaultaylor authored
Showing with 63 additions and 55 deletions.
  1. +9 −2 CMakeLists.txt
  2. 0  bin/linux/{ → x64}/gameplay-encoder
  3. BIN  bin/linux/x86/gameplay-encoder
  4. 0  external-deps/bullet/lib/linux/{ → x64}/libBulletCollision.a
  5. 0  external-deps/bullet/lib/linux/{ → x64}/libBulletDynamics.a
  6. 0  external-deps/bullet/lib/linux/{ → x64}/libLinearMath.a
  7. BIN  external-deps/bullet/lib/linux/x86/libBulletCollision.a
  8. BIN  external-deps/bullet/lib/linux/x86/libBulletDynamics.a
  9. BIN  external-deps/bullet/lib/linux/x86/libLinearMath.a
  10. 0  external-deps/collada-dom/lib/linux/{ → x64}/libcollada14dom.a
  11. BIN  external-deps/collada-dom/lib/linux/x86/libcollada14dom.a
  12. 0  external-deps/freetype2/lib/linux/{ → x64}/libfreetype.a
  13. BIN  external-deps/freetype2/lib/linux/x86/libfreetype.a
  14. 0  external-deps/glew/lib/linux/{ → x64}/libGLEW.a
  15. BIN  external-deps/glew/lib/linux/x86/libGLEW.a
  16. 0  external-deps/libpng/lib/linux/{ → x64}/libpng.a
  17. BIN  external-deps/libpng/lib/linux/x86/libpng.a
  18. 0  external-deps/lua/lib/linux/{ → x64}/liblua.a
  19. BIN  external-deps/lua/lib/linux/x86/liblua.a
  20. 0  external-deps/oggvorbis/lib/linux/{ → x64}/libogg.a
  21. 0  external-deps/oggvorbis/lib/linux/{ → x64}/libvorbis.a
  22. BIN  external-deps/oggvorbis/lib/linux/x86/libogg.a
  23. BIN  external-deps/oggvorbis/lib/linux/x86/libvorbis.a
  24. 0  external-deps/openal/lib/linux/{ → x64}/libopenal.a
  25. BIN  external-deps/openal/lib/linux/x86/libopenal.a
  26. 0  external-deps/zlib/lib/linux/{ → x64}/libz.a
  27. BIN  external-deps/zlib/lib/linux/x86/libz.a
  28. +5 −4 gameplay-encoder/CMakeLists.txt
  29. +6 −6 gameplay-samples/CMakeLists.txt
  30. +30 −30 gameplay-tests/CMakeLists.txt
  31. +13 −13 gameplay/CMakeLists.txt
View
11 CMakeLists.txt
@@ -2,15 +2,22 @@ cmake_minimum_required(VERSION 2.6)
project(GamePlay)
-set(GAMEPLAY_VERSION 1.5.0)
+set(GAMEPLAY_VERSION 1.6.0)
set(CMAKE_C_COMPILER_INIT g++)
# debug
message( "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}" )
-if( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
+if ( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
add_definitions(-D_DEBUG)
endif()
+# architecture
+if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
+set(ARCH_DIR "x64")
+else()
+set(ARCH_DIR "x86")
+endif()
+
# gameplay library
add_subdirectory(gameplay)
View
0  bin/linux/gameplay-encoder → bin/linux/x64/gameplay-encoder
File renamed without changes
View
BIN  bin/linux/x86/gameplay-encoder
Binary file not shown
View
0  external-deps/bullet/lib/linux/libBulletCollision.a → ...al-deps/bullet/lib/linux/x64/libBulletCollision.a
File renamed without changes
View
0  external-deps/bullet/lib/linux/libBulletDynamics.a → ...nal-deps/bullet/lib/linux/x64/libBulletDynamics.a
File renamed without changes
View
0  external-deps/bullet/lib/linux/libLinearMath.a → external-deps/bullet/lib/linux/x64/libLinearMath.a
File renamed without changes
View
BIN  external-deps/bullet/lib/linux/x86/libBulletCollision.a
Binary file not shown
View
BIN  external-deps/bullet/lib/linux/x86/libBulletDynamics.a
Binary file not shown
View
BIN  external-deps/bullet/lib/linux/x86/libLinearMath.a
Binary file not shown
View
0  ...rnal-deps/collada-dom/lib/linux/libcollada14dom.a → ...-deps/collada-dom/lib/linux/x64/libcollada14dom.a
File renamed without changes
View
BIN  external-deps/collada-dom/lib/linux/x86/libcollada14dom.a
Binary file not shown
View
0  external-deps/freetype2/lib/linux/libfreetype.a → external-deps/freetype2/lib/linux/x64/libfreetype.a
File renamed without changes
View
BIN  external-deps/freetype2/lib/linux/x86/libfreetype.a
Binary file not shown
View
0  external-deps/glew/lib/linux/libGLEW.a → external-deps/glew/lib/linux/x64/libGLEW.a
File renamed without changes
View
BIN  external-deps/glew/lib/linux/x86/libGLEW.a
Binary file not shown
View
0  external-deps/libpng/lib/linux/libpng.a → external-deps/libpng/lib/linux/x64/libpng.a
File renamed without changes
View
BIN  external-deps/libpng/lib/linux/x86/libpng.a
Binary file not shown
View
0  external-deps/lua/lib/linux/liblua.a → external-deps/lua/lib/linux/x64/liblua.a
File renamed without changes
View
BIN  external-deps/lua/lib/linux/x86/liblua.a
Binary file not shown
View
0  external-deps/oggvorbis/lib/linux/libogg.a → external-deps/oggvorbis/lib/linux/x64/libogg.a
File renamed without changes
View
0  external-deps/oggvorbis/lib/linux/libvorbis.a → external-deps/oggvorbis/lib/linux/x64/libvorbis.a
File renamed without changes
View
BIN  external-deps/oggvorbis/lib/linux/x86/libogg.a
Binary file not shown
View
BIN  external-deps/oggvorbis/lib/linux/x86/libvorbis.a
Binary file not shown
View
0  external-deps/openal/lib/linux/libopenal.a → external-deps/openal/lib/linux/x64/libopenal.a
File renamed without changes
View
BIN  external-deps/openal/lib/linux/x86/libopenal.a
Binary file not shown
View
0  external-deps/zlib/lib/linux/libz.a → external-deps/zlib/lib/linux/x64/libz.a
File renamed without changes
View
BIN  external-deps/zlib/lib/linux/x86/libz.a
Binary file not shown
View
9 gameplay-encoder/CMakeLists.txt
@@ -9,13 +9,14 @@ include_directories(
/usr/include
)
+add_definitions(-D_DEBUG)
add_definitions(-D__linux__ -DNO_BOOST -DNO_ZAE)
link_directories(
- ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/freetype2/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/collada-dom/lib/linux
+ ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/freetype2/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/collada-dom/lib/linux/${ARCH_DIR}
/usr/lib
)
View
12 gameplay-samples/CMakeLists.txt
@@ -14,12 +14,12 @@ include_directories(
add_definitions(-D__linux__)
link_directories(
- ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux
+ ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux/${ARCH_DIR}
)
View
60 gameplay-tests/CMakeLists.txt
@@ -13,12 +13,12 @@ include_directories(
add_definitions(-D__linux__)
link_directories(
- ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux
- ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux
+ ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux/${ARCH_DIR}
+ ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux/${ARCH_DIR}
)
@@ -48,38 +48,38 @@ set( GAME_NAME gameplay-tests)
set(GAME_SRC
src/FirstPersonCamera.cpp
- src/FirstPersonCamera.h
+ src/FirstPersonCamera.h
src/Grid.cpp
- src/Grid.h
+ src/Grid.h
src/Test.cpp
- src/Test.h
+ src/Test.h
src/TestsGame.cpp
- src/TestsGame.h
+ src/TestsGame.h
src/Audio3DTest.cpp
- src/Audio3DTest.h
- src/CreateSceneTest.cpp
- src/CreateSceneTest.h
- src/CreateSceneTest.h
+ src/Audio3DTest.h
+ src/CreateSceneTest.cpp
+ src/CreateSceneTest.h
+ src/CreateSceneTest.h
src/GestureTest.cpp
src/GestureTest.h
src/InputTest.cpp
src/InputTest.h
- src/LoadSceneTest.cpp
- src/LoadSceneTest.h
- src/MeshBatchTest.cpp
- src/MeshBatchTest.h
- src/MeshPrimitiveTest.cpp
- src/MeshPrimitiveTest.h
- src/PhysicsSceneTest.cpp
- src/PhysicsSceneTest.h
- src/SpriteBatchTest.cpp
- src/SpriteBatchTest.h
- src/TextTest.cpp
- src/TextTest.h
- src/TextureTest.cpp
- src/TextureTest.h
- src/TriangleTest.cpp
- src/TriangleTest.h
+ src/LoadSceneTest.cpp
+ src/LoadSceneTest.h
+ src/MeshBatchTest.cpp
+ src/MeshBatchTest.h
+ src/MeshPrimitiveTest.cpp
+ src/MeshPrimitiveTest.h
+ src/PhysicsSceneTest.cpp
+ src/PhysicsSceneTest.h
+ src/SpriteBatchTest.cpp
+ src/SpriteBatchTest.h
+ src/TextTest.cpp
+ src/TextTest.h
+ src/TextureTest.cpp
+ src/TextureTest.h
+ src/TriangleTest.cpp
+ src/TriangleTest.h
)
add_executable(${GAME_NAME}
View
26 gameplay/CMakeLists.txt
@@ -77,7 +77,7 @@ set(GAMEPLAY_SRC
src/gameplay-main-blackberry.cpp
src/gameplay-main-linux.cpp
src/gameplay-main-windows.cpp
- src/Gesture.h
+ src/Gesture.h
src/Image.cpp
src/Image.h
src/Image.inl
@@ -146,10 +146,10 @@ set(GAMEPLAY_SRC
src/PhysicsSocketConstraint.h
src/PhysicsSpringConstraint.cpp
src/PhysicsSpringConstraint.h
- src/PhysicsVehicle.cpp
- src/PhysicsVehicle.h
- src/PhysicsVehicleWheel.cpp
- src/PhysicsVehicle.h
+ src/PhysicsVehicle.cpp
+ src/PhysicsVehicle.h
+ src/PhysicsVehicleWheel.cpp
+ src/PhysicsVehicle.h
src/Plane.cpp
src/Plane.h
src/Plane.inl
@@ -333,10 +333,10 @@ set(GAMEPLAY_LUA
src/lua/lua_GamepadGamepadEvent.h
src/lua/lua_GameState.cpp
src/lua/lua_GameState.h
- src/lua/lua_Gesture.cpp
- src/lua/lua_Gesture.h
- src/lua/lua_GestureGestureEvent.cpp
- src/lua/lua_GestureGestureEvent.h
+ src/lua/lua_Gesture.cpp
+ src/lua/lua_Gesture.h
+ src/lua/lua_GestureGestureEvent.cpp
+ src/lua/lua_GestureGestureEvent.h
src/lua/lua_Global.cpp
src/lua/lua_Global.h
src/lua/lua_Image.cpp
@@ -451,10 +451,10 @@ set(GAMEPLAY_LUA
src/lua/lua_PhysicsSocketConstraint.h
src/lua/lua_PhysicsSpringConstraint.cpp
src/lua/lua_PhysicsSpringConstraint.h
- src/lua/lua_PhysicsVehicle.cpp
- src/lua/lua_PhysicsVehicle.h
- src/lua/lua_PhysicsVehicleWheel.cpp
- src/lua/lua_PhysicsVehicleWheel.h
+ src/lua/lua_PhysicsVehicle.cpp
+ src/lua/lua_PhysicsVehicle.h
+ src/lua/lua_PhysicsVehicleWheel.cpp
+ src/lua/lua_PhysicsVehicleWheel.h
src/lua/lua_Plane.cpp
src/lua/lua_Plane.h
src/lua/lua_Platform.cpp
Please sign in to comment.
Something went wrong with that request. Please try again.