Quellcode durchsuchen

Fixes for Android

Daniele Bartolini vor 11 Jahren
Ursprung
Commit
84b942a870

+ 1 - 1
engine/lua/lua_raycast.cpp

@@ -28,7 +28,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "lua_environment.h"
 #include "raycast.h"
 #include "memory.h"
-#include "log.h"
+#include "array.h"
 
 namespace crown
 {

+ 1 - 0
engine/physics/physics_world.cpp

@@ -46,6 +46,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "color4.h"
 #include "int_setting.h"
 #include "physics.h"
+#include "matrix4x4.h"
 
 #include "PxPhysicsAPI.h"
 

+ 5 - 7
engine/resource/lua_resource.cpp

@@ -34,12 +34,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "array.h"
 #include "compile_options.h"
 
-#if CROWN_PLATFORM_WINDOWS
-	#define LUAJIT_EXECUTABLE "luajit.exe"
-#else
-	#define LUAJIT_EXECUTABLE "./luajit"
-#endif
-
 #if defined(CROWN_DEBUG)
 	#define LUAJIT_FLAGS "-bg" // Keep debug info
 #else
@@ -63,7 +57,11 @@ namespace lua_resource
 
 		const char* luajit[] =
 		{
-			LUAJIT_EXECUTABLE,
+#if CROWN_PLATFORM_LINUX
+			"./luajit"
+#else
+			"luajit.exe"
+#endif // CROWN_PLATFORM_LINUX
 			LUAJIT_FLAGS,
 			res_abs_path.c_str(),
 			bc_abs_path.c_str(),

+ 1 - 0
engine/world/world.cpp

@@ -34,6 +34,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "actor.h"
 #include "lua_environment.h"
 #include "level_resource.h"
+#include "matrix4x4.h"
 
 namespace crown
 {