Home Explore Help
Sign In
cpp
/
GamePlay
mirror of https://github.com/gameplay3d/GamePlay
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge pull request #434 from kwhatmough/next

Adds new MathUtil.cpp file to Linux and Android projects.
Ken Whatmough 13 years ago
parent
b66ea12fd4 0436fd846d
commit
23e54bf78b
2 changed files with 3 additions and 1 deletions
Split View Show Diff Stats
  1. 1 0
      gameplay/CMakeLists.txt
  2. 2 1
      gameplay/android/jni/Android.mk

+ 1 - 0
gameplay/CMakeLists.txt
View File 

@@ -96,6 +96,7 @@ set(GAMEPLAY_SRC
 
     src/Material.h
 
     src/MaterialParameter.cpp
 
     src/MaterialParameter.h
 
+    src/MathUtil.cpp
 
     src/MathUtil.h
 
     src/MathUtil.inl
 
     src/MathUtilNeon.inl

+ 2 - 1
gameplay/android/jni/Android.mk
View File 

@@ -61,6 +61,7 @@ LOCAL_SRC_FILES := \
 
     Light.cpp \
 
     Material.cpp \
 
     MaterialParameter.cpp \
 
+    MathUtil.cpp \
 
     Matrix.cpp \
 
     Mesh.cpp \
 
     MeshBatch.cpp \
 
@@ -281,4 +282,4 @@ LOCAL_STATIC_LIBRARIES := android_native_app_glue
 
 
 include $(BUILD_STATIC_LIBRARY)
 
 
-$(call import-module,android/native_app_glue)
 
+$(call import-module,android/native_app_glue)