Browse Source

Updated bullet physics to 2.82r2704 on Linux

seanpaultaylor 11 years ago
parent
commit
a4a6e2a401
4 changed files with 9 additions and 3 deletions
  1. 5 0
      CHANGES.md
  2. 2 1
      CMakeLists.txt
  3. 1 1
      README.md
  4. 1 1
      tools/luagen/CMakeLists.txt

+ 5 - 0
CHANGES.md

@@ -1,3 +1,8 @@
+## v3.0.0
+
+- Adds support for MacOSX 64-bit.
+
+
 ## v2.0.0
 ## v2.0.0
 
 
 - Adds support for Visual Studio 2013.
 - Adds support for Visual Studio 2013.

+ 2 - 1
CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6)
 
 
 project(GamePlay)
 project(GamePlay)
 
 
-set(GAMEPLAY_VERSION 2.0.0)
+set(GAMEPLAY_VERSION 3.0.0)
 set(CMAKE_C_COMPILER_INIT g++)
 set(CMAKE_C_COMPILER_INIT g++)
 
 
 # debug
 # debug
@@ -27,3 +27,4 @@ add_subdirectory(samples)
 # gameplay encoder
 # gameplay encoder
 # A pre-compiled executable can be found in 'gameplay/bin'. Uncomment to build yourself.
 # A pre-compiled executable can be found in 'gameplay/bin'. Uncomment to build yourself.
 #add_subdirectory(tools/encoder)
 #add_subdirectory(tools/encoder)
+add_subdirectory(tools/luagen)

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-## GamePlay v2.0.0
+## GamePlay v3.0.0
 
 
 GamePlay3D is an open-source, cross-platform 3D native C++ game framework making it easy to learn and write mobile and desktop games. 
 GamePlay3D is an open-source, cross-platform 3D native C++ game framework making it easy to learn and write mobile and desktop games. 
 
 

+ 1 - 1
tools/luagen/CMakeLists.txt

@@ -9,7 +9,7 @@ add_definitions(-D__linux__)
 
 
 link_directories(
 link_directories(
     ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux/${ARCH_DIR}
     ${CMAKE_SOURCE_DIR}/external-deps/lua/lib/linux/${ARCH_DIR}
-    ${CMAKE_SOURCE_DIR}/external-deps/tinyxml2/lib/linux
+    ${CMAKE_SOURCE_DIR}/external-deps/tinyxml2/lib/linux/${ARCH_DIR}
     /usr/lib
     /usr/lib
 )
 )