change make files (see previous commit)

src/Android.mk

@@ -2,7 +2,7 @@
 LOCAL_PATH := $(call my-dir)
 
 ###############################################################################
-libluajit-5.1
+# libluajit-5.1
 ###############################################################################
 include $(CLEAR_VARS)
 
@@ -11,7 +11,7 @@ LOCAL_SRC_FILES := libluajit-5.1.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 ###############################################################################
-libcrown
+# libcrown
 ###############################################################################
 include $(CLEAR_VARS)
 
@@ -58,9 +58,6 @@ LOCAL_SRC_FILES :=\
 	input/Touch.cpp\
 	input/EventDispatcher.cpp\
 	input/InputManager.cpp\
-\
-	lua/LuaStack.cpp\
-	lua/LuaEnvironment.cpp\
 \
 	network/BitMessage.cpp\
 \
@@ -81,6 +78,20 @@ LOCAL_SRC_FILES :=\
 	renderers/DebugRenderer.cpp\
 	renderers/PixelFormat.cpp\
 	renderers/VertexFormat.cpp\
+\
+	lua/LuaStack.cpp\
+	lua/LuaEnvironment.cpp\
+	lua/AccelerometerBinds.cpp\
+	lua/CameraBinds.cpp\
+	lua/DeviceBinds.cpp\
+	lua/KeyboardBinds.cpp\
+	lua/Mat4Binds.cpp\
+	lua/MathBinds.cpp\
+	lua/MouseBinds.cpp\
+	lua/QuatBinds.cpp\
+	lua/TouchBinds.cpp\
+	lua/Vec2Binds.cpp\
+	lua/Vec3Binds.cpp\
 \
 	ArchiveBundle.cpp\
 	Camera.cpp\
@@ -118,7 +129,6 @@ LOCAL_C_INCLUDES	:=\
 	$(LOCAL_PATH)/renderers\
 	$(LOCAL_PATH)/renderers/gles\
 	$(LOCAL_PATH)/renderers/gles/egl\
-	$(LOCAL_PATH)/samples\
 	$(LOCAL_PATH)/third/luajit/include/luajit-2.0\
 \
 
@@ -128,38 +138,5 @@ LOCAL_SHARED_LIBRARIES := luajit-5.1
 LOCAL_STATIC_LIBRARIES := android_native_app_glue
 include $(BUILD_SHARED_LIBRARY)
 
-###############################################################################
-libcrownlua
-###############################################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := crownlua
-
-LOCAL_SRC_FILES :=\
-	lua/LuaStack.cpp\
-	lua/LuaEnvironment.cpp\
-	lua/AccelerometerBinds.cpp\
-	lua/CameraBinds.cpp\
-	lua/DeviceBinds.cpp\
-	lua/KeyboardBinds.cpp\
-	lua/Mat4Binds.cpp\
-	lua/MathBinds.cpp\
-	lua/MouseBinds.cpp\
-	lua/QuatBinds.cpp\
-	lua/TouchBinds.cpp\
-	lua/Vec2Binds.cpp\
-	lua/Vec3Binds.cpp\
-\
-
-LOCAL_C_INCLUDES	:=\
-	$(LOCAL_PATH)/lua\
-\	
-
-LOCAL_CPPFLAGS	:= -g -fexceptions -Wl,-E
-LOCAL_LDLIBS	:= -llog -landroid
-LOCAL_SHARED_LIBRARIES := crown
-include $(BUILD_SHARED_LIBRARY)
-
-
 $(call import-module,android/native_app_glue)
 

src/CMakeLists.txt

@@ -241,7 +241,26 @@ set (OS_HEADERS
 	os/NetAddress.h
 )
 
-# Platform independent libraries
+set(LUA_SRC
+	lua/LuaStack.cpp
+	lua/LuaEnvironment.cpp
+	lua/Vec2Binds.cpp
+	lua/Vec3Binds.cpp
+	lua/Mat4Binds.cpp
+	lua/QuatBinds.cpp
+	lua/MathBinds.cpp
+	lua/MouseBinds.cpp
+	lua/KeyboardBinds.cpp
+	lua/AccelerometerBinds.cpp
+	lua/DeviceBinds.cpp
+)
+
+set(LUA_HEADERS
+	lua/LuaStack.h
+	lua/LuaEnvironment.h
+)
+
+
 set (CROWN_LIBRARIES)
 
 set (COMPILER_FLAGS
@@ -256,6 +275,7 @@ set (COMPILER_FLAGS
 	-g
 	-pg
 	-fPIC
+	-Wl,-E
 )
 
 # Platform specific stuff
@@ -371,11 +391,12 @@ set (CROWN_SOURCES
 #	${NETWORK_SRC}
 
 	${OS_SRC}
+
+	${LUA_SRC}
 )
 
 set (CROWN_HEADERS
 	${HEADERS}
-
 	${CORE_HEADERS}
 	${BV_HEADERS}
 	${CONTAINERS_HEADERS}
@@ -392,6 +413,8 @@ set (CROWN_HEADERS
 #	${NETWORK_HEADERS}
 
 	${OS_HEADERS}
+
+	${LUA_HEADERS}
 )
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Config.h)
@@ -400,15 +423,12 @@ include_directories(${CROWN_INCLUDES} ${CROWN_THIRD_INCLUDES})
 link_directories(${CROWN_THIRD_LIBS})
 link_libraries(${CROWN_LIBRARIES})
 
-# Lua bindings and systems
-add_subdirectory(lua)
-
 add_definitions(${COMPILER_FLAGS})
 
-add_library(crown STATIC ${CROWN_SOURCES} ${CROWN_HEADERS})
+add_library(crown SHARED ${CROWN_SOURCES} ${CROWN_HEADERS})
 
 add_executable(${CROWN_EXECUTABLE_NAME} ${CROWN_MAIN_SRC})
-target_link_libraries(${CROWN_EXECUTABLE_NAME} crown crownlua)
+target_link_libraries(${CROWN_EXECUTABLE_NAME} crown)
 
 install (TARGETS crown DESTINATION lib/${CMAKE_PROJECT_NAME})
 install (TARGETS ${CROWN_EXECUTABLE_NAME} DESTINATION bin)
@@ -429,4 +449,4 @@ install (FILES ${INPUT_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/input)
 install (FILES ${RENDERERS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/renderers)
 install (FILES ${NETWORK_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/network)
 install (FILES ${OS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/os)
-
+install (FILES ${LUA_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/lua)