Skip to content
This repository
Browse code

Added Linux 32-bit libs and encoder

  • Loading branch information...
commit 09e3f89c2af88007440b7842c363c892a154cdd0 1 parent 2428371
Sean Taylor seanpaultaylor authored

Showing 31 changed files with 63 additions and 55 deletions. Show diff stats Hide diff stats

  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
11 CMakeLists.txt
@@ -2,15 +2,22 @@ cmake_minimum_required(VERSION 2.6)
2 2
3 3 project(GamePlay)
4 4
5   -set(GAMEPLAY_VERSION 1.5.0)
  5 +set(GAMEPLAY_VERSION 1.6.0)
6 6 set(CMAKE_C_COMPILER_INIT g++)
7 7
8 8 # debug
9 9 message( "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}" )
10   -if( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
  10 +if ( "${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG" )
11 11 add_definitions(-D_DEBUG)
12 12 endif()
13 13
  14 +# architecture
  15 +if ( CMAKE_SIZEOF_VOID_P EQUAL 8 )
  16 +set(ARCH_DIR "x64")
  17 +else()
  18 +set(ARCH_DIR "x86")
  19 +endif()
  20 +
14 21 # gameplay library
15 22 add_subdirectory(gameplay)
16 23
0  bin/linux/gameplay-encoder → bin/linux/x64/gameplay-encoder
File renamed without changes
BIN  bin/linux/x86/gameplay-encoder
Binary file not shown
0  external-deps/bullet/lib/linux/libBulletCollision.a → ...al-deps/bullet/lib/linux/x64/libBulletCollision.a
File renamed without changes
0  external-deps/bullet/lib/linux/libBulletDynamics.a → ...nal-deps/bullet/lib/linux/x64/libBulletDynamics.a
File renamed without changes
0  external-deps/bullet/lib/linux/libLinearMath.a → external-deps/bullet/lib/linux/x64/libLinearMath.a
File renamed without changes
BIN  external-deps/bullet/lib/linux/x86/libBulletCollision.a
Binary file not shown
BIN  external-deps/bullet/lib/linux/x86/libBulletDynamics.a
Binary file not shown
BIN  external-deps/bullet/lib/linux/x86/libLinearMath.a
Binary file not shown
0  ...rnal-deps/collada-dom/lib/linux/libcollada14dom.a → ...-deps/collada-dom/lib/linux/x64/libcollada14dom.a
File renamed without changes
BIN  external-deps/collada-dom/lib/linux/x86/libcollada14dom.a
Binary file not shown
0  external-deps/freetype2/lib/linux/libfreetype.a → external-deps/freetype2/lib/linux/x64/libfreetype.a
File renamed without changes
BIN  external-deps/freetype2/lib/linux/x86/libfreetype.a
Binary file not shown
0  external-deps/glew/lib/linux/libGLEW.a → external-deps/glew/lib/linux/x64/libGLEW.a
File renamed without changes
BIN  external-deps/glew/lib/linux/x86/libGLEW.a
Binary file not shown
0  external-deps/libpng/lib/linux/libpng.a → external-deps/libpng/lib/linux/x64/libpng.a
File renamed without changes
BIN  external-deps/libpng/lib/linux/x86/libpng.a
Binary file not shown
0  external-deps/lua/lib/linux/liblua.a → external-deps/lua/lib/linux/x64/liblua.a
File renamed without changes
BIN  external-deps/lua/lib/linux/x86/liblua.a
Binary file not shown
0  external-deps/oggvorbis/lib/linux/libogg.a → external-deps/oggvorbis/lib/linux/x64/libogg.a
File renamed without changes
0  external-deps/oggvorbis/lib/linux/libvorbis.a → external-deps/oggvorbis/lib/linux/x64/libvorbis.a
File renamed without changes
BIN  external-deps/oggvorbis/lib/linux/x86/libogg.a
Binary file not shown
BIN  external-deps/oggvorbis/lib/linux/x86/libvorbis.a
Binary file not shown
0  external-deps/openal/lib/linux/libopenal.a → external-deps/openal/lib/linux/x64/libopenal.a
File renamed without changes
BIN  external-deps/openal/lib/linux/x86/libopenal.a
Binary file not shown
0  external-deps/zlib/lib/linux/libz.a → external-deps/zlib/lib/linux/x64/libz.a
File renamed without changes
BIN  external-deps/zlib/lib/linux/x86/libz.a
Binary file not shown
9 gameplay-encoder/CMakeLists.txt
@@ -9,13 +9,14 @@ include_directories(
9 9 /usr/include
10 10 )
11 11
  12 +add_definitions(-D_DEBUG)
12 13 add_definitions(-D__linux__ -DNO_BOOST -DNO_ZAE)
13 14
14 15 link_directories(
15   - ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux
16   - ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux
17   - ${CMAKE_SOURCE_DIR}/external-deps/freetype2/lib/linux
18   - ${CMAKE_SOURCE_DIR}/external-deps/collada-dom/lib/linux
  16 + ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux/${ARCH_DIR}
  17 + ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux/${ARCH_DIR}
  18 + ${CMAKE_SOURCE_DIR}/external-deps/freetype2/lib/linux/${ARCH_DIR}
  19 + ${CMAKE_SOURCE_DIR}/external-deps/collada-dom/lib/linux/${ARCH_DIR}
19 20 /usr/lib
20 21 )
21 22
12 gameplay-samples/CMakeLists.txt
@@ -14,12 +14,12 @@ include_directories(
14 14 add_definitions(-D__linux__)
15 15
16 16 link_directories(
17   - ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux
18   - ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux
19   - ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux
20   - ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux
21   - ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux
22   - ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux
  17 + ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux/${ARCH_DIR}
  18 + ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux/${ARCH_DIR}
  19 + ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux/${ARCH_DIR}
  20 + ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux/${ARCH_DIR}
  21 + ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux/${ARCH_DIR}
  22 + ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux/${ARCH_DIR}
23 23 )
24 24
25 25
60 gameplay-tests/CMakeLists.txt
@@ -13,12 +13,12 @@ include_directories(
13 13 add_definitions(-D__linux__)
14 14
15 15 link_directories(
16   - ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux
17   - ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux
18   - ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux
19   - ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux
20   - ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux
21   - ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux
  16 + ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux/${ARCH_DIR}
  17 + ${CMAKE_SOURCE_DIR}/external-deps/zlib/lib/linux/${ARCH_DIR}
  18 + ${CMAKE_SOURCE_DIR}/external-deps/libpng/lib/linux/${ARCH_DIR}
  19 + ${CMAKE_SOURCE_DIR}/external-deps/bullet/lib/linux/${ARCH_DIR}
  20 + ${CMAKE_SOURCE_DIR}/external-deps/oggvorbis/lib/linux/${ARCH_DIR}
  21 + ${CMAKE_SOURCE_DIR}/external-deps/glew/lib/linux/${ARCH_DIR}
22 22 )
23 23
24 24
@@ -48,38 +48,38 @@ set( GAME_NAME gameplay-tests)
48 48 set(GAME_SRC
49 49
50 50 src/FirstPersonCamera.cpp
51   - src/FirstPersonCamera.h
  51 + src/FirstPersonCamera.h
52 52 src/Grid.cpp
53   - src/Grid.h
  53 + src/Grid.h
54 54 src/Test.cpp
55   - src/Test.h
  55 + src/Test.h
56 56 src/TestsGame.cpp
57   - src/TestsGame.h
  57 + src/TestsGame.h
58 58 src/Audio3DTest.cpp
59   - src/Audio3DTest.h
60   - src/CreateSceneTest.cpp
61   - src/CreateSceneTest.h
62   - src/CreateSceneTest.h
  59 + src/Audio3DTest.h
  60 + src/CreateSceneTest.cpp
  61 + src/CreateSceneTest.h
  62 + src/CreateSceneTest.h
63 63 src/GestureTest.cpp
64 64 src/GestureTest.h
65 65 src/InputTest.cpp
66 66 src/InputTest.h
67   - src/LoadSceneTest.cpp
68   - src/LoadSceneTest.h
69   - src/MeshBatchTest.cpp
70   - src/MeshBatchTest.h
71   - src/MeshPrimitiveTest.cpp
72   - src/MeshPrimitiveTest.h
73   - src/PhysicsSceneTest.cpp
74   - src/PhysicsSceneTest.h
75   - src/SpriteBatchTest.cpp
76   - src/SpriteBatchTest.h
77   - src/TextTest.cpp
78   - src/TextTest.h
79   - src/TextureTest.cpp
80   - src/TextureTest.h
81   - src/TriangleTest.cpp
82   - src/TriangleTest.h
  67 + src/LoadSceneTest.cpp
  68 + src/LoadSceneTest.h
  69 + src/MeshBatchTest.cpp
  70 + src/MeshBatchTest.h
  71 + src/MeshPrimitiveTest.cpp
  72 + src/MeshPrimitiveTest.h
  73 + src/PhysicsSceneTest.cpp
  74 + src/PhysicsSceneTest.h
  75 + src/SpriteBatchTest.cpp
  76 + src/SpriteBatchTest.h
  77 + src/TextTest.cpp
  78 + src/TextTest.h
  79 + src/TextureTest.cpp
  80 + src/TextureTest.h
  81 + src/TriangleTest.cpp
  82 + src/TriangleTest.h
83 83 )
84 84
85 85 add_executable(${GAME_NAME}
26 gameplay/CMakeLists.txt
@@ -77,7 +77,7 @@ set(GAMEPLAY_SRC
77 77 src/gameplay-main-blackberry.cpp
78 78 src/gameplay-main-linux.cpp
79 79 src/gameplay-main-windows.cpp
80   - src/Gesture.h
  80 + src/Gesture.h
81 81 src/Image.cpp
82 82 src/Image.h
83 83 src/Image.inl
@@ -146,10 +146,10 @@ set(GAMEPLAY_SRC
146 146 src/PhysicsSocketConstraint.h
147 147 src/PhysicsSpringConstraint.cpp
148 148 src/PhysicsSpringConstraint.h
149   - src/PhysicsVehicle.cpp
150   - src/PhysicsVehicle.h
151   - src/PhysicsVehicleWheel.cpp
152   - src/PhysicsVehicle.h
  149 + src/PhysicsVehicle.cpp
  150 + src/PhysicsVehicle.h
  151 + src/PhysicsVehicleWheel.cpp
  152 + src/PhysicsVehicle.h
153 153 src/Plane.cpp
154 154 src/Plane.h
155 155 src/Plane.inl
@@ -333,10 +333,10 @@ set(GAMEPLAY_LUA
333 333 src/lua/lua_GamepadGamepadEvent.h
334 334 src/lua/lua_GameState.cpp
335 335 src/lua/lua_GameState.h
336   - src/lua/lua_Gesture.cpp
337   - src/lua/lua_Gesture.h
338   - src/lua/lua_GestureGestureEvent.cpp
339   - src/lua/lua_GestureGestureEvent.h
  336 + src/lua/lua_Gesture.cpp
  337 + src/lua/lua_Gesture.h
  338 + src/lua/lua_GestureGestureEvent.cpp
  339 + src/lua/lua_GestureGestureEvent.h
340 340 src/lua/lua_Global.cpp
341 341 src/lua/lua_Global.h
342 342 src/lua/lua_Image.cpp
@@ -451,10 +451,10 @@ set(GAMEPLAY_LUA
451 451 src/lua/lua_PhysicsSocketConstraint.h
452 452 src/lua/lua_PhysicsSpringConstraint.cpp
453 453 src/lua/lua_PhysicsSpringConstraint.h
454   - src/lua/lua_PhysicsVehicle.cpp
455   - src/lua/lua_PhysicsVehicle.h
456   - src/lua/lua_PhysicsVehicleWheel.cpp
457   - src/lua/lua_PhysicsVehicleWheel.h
  454 + src/lua/lua_PhysicsVehicle.cpp
  455 + src/lua/lua_PhysicsVehicle.h
  456 + src/lua/lua_PhysicsVehicleWheel.cpp
  457 + src/lua/lua_PhysicsVehicleWheel.h
458 458 src/lua/lua_Plane.cpp
459 459 src/lua/lua_Plane.h
460 460 src/lua/lua_Platform.cpp

0 comments on commit 09e3f89

Please sign in to comment.
Something went wrong with that request. Please try again.