diff options
Diffstat (limited to '')
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | lib/expat/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | lib/luaexpat/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | lib/tolua++/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | lib/tolua++/Makefile | 45 | ||||
| -rw-r--r-- | src/Bindings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
7 files changed, 72 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b59ade49d..d262ecb5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,9 @@ cmake_minimum_required (VERSION 2.6) project (MCServer) set(CMAKE_CXX_FLAGS_BAK ${CMAKE_CXX_FLAGS}) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") +set(CMAKE_C_FLAGS_BAK ${CMAKE_C_FLAGS}) +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") set(CMAKE_BUILD_TYPE_BAK ${CMAKE_BUILD_TYPE}) set(CMAKE_BUILD_TYPE "Release") @@ -14,10 +16,14 @@ add_subdirectory(lib/zlib/) add_subdirectory(lib/lua/) add_subdirectory(lib/tolua++/) add_subdirectory(lib/sqlite/) +add_subdirectory(lib/expat/) +add_subdirectory(lib/luaexpat/) #TODo: set -Wall -Werror -Wextra set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_BAK}") set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE_BAK}") +set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic") add_subdirectory (src) diff --git a/lib/expat/CMakeLists.txt b/lib/expat/CMakeLists.txt new file mode 100644 index 000000000..df9e8d57c --- /dev/null +++ b/lib/expat/CMakeLists.txt @@ -0,0 +1,11 @@ + +cmake_minimum_required (VERSION 2.6) +project (expat) + +include_directories ("${PROJECT_SOURCE_DIR}/../../src/") + +file(GLOB SOURCE + "*.c" +) + +add_library(expat ${SOURCE}) diff --git a/lib/luaexpat/CMakeLists.txt b/lib/luaexpat/CMakeLists.txt new file mode 100644 index 000000000..7eef5c8ce --- /dev/null +++ b/lib/luaexpat/CMakeLists.txt @@ -0,0 +1,14 @@ + +cmake_minimum_required (VERSION 2.6) +project (luaexpat) + +include_directories ("${PROJECT_SOURCE_DIR}/../../src/") +include_directories ("${PROJECT_SOURCE_DIR}/../") + +file(GLOB SOURCE + "*.c" +) + +add_library(luaexpat ${SOURCE}) + +target_link_libraries(luaexpat expat) diff --git a/lib/tolua++/CMakeLists.txt b/lib/tolua++/CMakeLists.txt index 2b071108c..877b89076 100644 --- a/lib/tolua++/CMakeLists.txt +++ b/lib/tolua++/CMakeLists.txt @@ -6,12 +6,16 @@ include_directories ("${PROJECT_SOURCE_DIR}/../../src/") include_directories ("${PROJECT_SOURCE_DIR}/include/") include_directories ("${PROJECT_SOURCE_DIR}/../") -file(GLOB SOURCE +file(GLOB LIB_SOURCE + "src/lib/*.c" +) + +file(GLOB BIN_SOURCE "src/bin/*.c" - "src/lib/*.c" ) -add_executable(tolua ${SOURCE}) +add_executable(tolua ${BIN_SOURCE}) +add_library(tolualib ${LIB_SOURCE}) #m is the standard math librarys -target_link_libraries(tolua lua m) +target_link_libraries(tolua lua m tolualib) diff --git a/lib/tolua++/Makefile b/lib/tolua++/Makefile index e5a4b2d85..c15b4fc80 100644 --- a/lib/tolua++/Makefile +++ b/lib/tolua++/Makefile @@ -109,6 +109,20 @@ tolua/fast: cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/build .PHONY : tolua/fast +# Convenience name for target. +lib/tolua++/CMakeFiles/tolualib.dir/rule: + cd /home/tycho/MCServer && $(MAKE) -f CMakeFiles/Makefile2 lib/tolua++/CMakeFiles/tolualib.dir/rule +.PHONY : lib/tolua++/CMakeFiles/tolualib.dir/rule + +# Convenience name for target. +tolualib: lib/tolua++/CMakeFiles/tolualib.dir/rule +.PHONY : tolualib + +# fast build rule for target. +tolualib/fast: + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/build +.PHONY : tolualib/fast + src/bin/tolua.o: src/bin/tolua.c.o .PHONY : src/bin/tolua.o @@ -162,7 +176,7 @@ src/lib/tolua_event.o: src/lib/tolua_event.c.o # target to build an object file src/lib/tolua_event.c.o: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_event.c.o + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_event.c.o .PHONY : src/lib/tolua_event.c.o src/lib/tolua_event.i: src/lib/tolua_event.c.i @@ -170,7 +184,7 @@ src/lib/tolua_event.i: src/lib/tolua_event.c.i # target to preprocess a source file src/lib/tolua_event.c.i: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_event.c.i + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_event.c.i .PHONY : src/lib/tolua_event.c.i src/lib/tolua_event.s: src/lib/tolua_event.c.s @@ -178,7 +192,7 @@ src/lib/tolua_event.s: src/lib/tolua_event.c.s # target to generate assembly for a file src/lib/tolua_event.c.s: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_event.c.s + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_event.c.s .PHONY : src/lib/tolua_event.c.s src/lib/tolua_is.o: src/lib/tolua_is.c.o @@ -186,7 +200,7 @@ src/lib/tolua_is.o: src/lib/tolua_is.c.o # target to build an object file src/lib/tolua_is.c.o: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_is.c.o + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_is.c.o .PHONY : src/lib/tolua_is.c.o src/lib/tolua_is.i: src/lib/tolua_is.c.i @@ -194,7 +208,7 @@ src/lib/tolua_is.i: src/lib/tolua_is.c.i # target to preprocess a source file src/lib/tolua_is.c.i: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_is.c.i + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_is.c.i .PHONY : src/lib/tolua_is.c.i src/lib/tolua_is.s: src/lib/tolua_is.c.s @@ -202,7 +216,7 @@ src/lib/tolua_is.s: src/lib/tolua_is.c.s # target to generate assembly for a file src/lib/tolua_is.c.s: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_is.c.s + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_is.c.s .PHONY : src/lib/tolua_is.c.s src/lib/tolua_map.o: src/lib/tolua_map.c.o @@ -210,7 +224,7 @@ src/lib/tolua_map.o: src/lib/tolua_map.c.o # target to build an object file src/lib/tolua_map.c.o: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_map.c.o + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_map.c.o .PHONY : src/lib/tolua_map.c.o src/lib/tolua_map.i: src/lib/tolua_map.c.i @@ -218,7 +232,7 @@ src/lib/tolua_map.i: src/lib/tolua_map.c.i # target to preprocess a source file src/lib/tolua_map.c.i: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_map.c.i + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_map.c.i .PHONY : src/lib/tolua_map.c.i src/lib/tolua_map.s: src/lib/tolua_map.c.s @@ -226,7 +240,7 @@ src/lib/tolua_map.s: src/lib/tolua_map.c.s # target to generate assembly for a file src/lib/tolua_map.c.s: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_map.c.s + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_map.c.s .PHONY : src/lib/tolua_map.c.s src/lib/tolua_push.o: src/lib/tolua_push.c.o @@ -234,7 +248,7 @@ src/lib/tolua_push.o: src/lib/tolua_push.c.o # target to build an object file src/lib/tolua_push.c.o: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_push.c.o + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_push.c.o .PHONY : src/lib/tolua_push.c.o src/lib/tolua_push.i: src/lib/tolua_push.c.i @@ -242,7 +256,7 @@ src/lib/tolua_push.i: src/lib/tolua_push.c.i # target to preprocess a source file src/lib/tolua_push.c.i: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_push.c.i + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_push.c.i .PHONY : src/lib/tolua_push.c.i src/lib/tolua_push.s: src/lib/tolua_push.c.s @@ -250,7 +264,7 @@ src/lib/tolua_push.s: src/lib/tolua_push.c.s # target to generate assembly for a file src/lib/tolua_push.c.s: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_push.c.s + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_push.c.s .PHONY : src/lib/tolua_push.c.s src/lib/tolua_to.o: src/lib/tolua_to.c.o @@ -258,7 +272,7 @@ src/lib/tolua_to.o: src/lib/tolua_to.c.o # target to build an object file src/lib/tolua_to.c.o: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_to.c.o + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_to.c.o .PHONY : src/lib/tolua_to.c.o src/lib/tolua_to.i: src/lib/tolua_to.c.i @@ -266,7 +280,7 @@ src/lib/tolua_to.i: src/lib/tolua_to.c.i # target to preprocess a source file src/lib/tolua_to.c.i: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_to.c.i + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_to.c.i .PHONY : src/lib/tolua_to.c.i src/lib/tolua_to.s: src/lib/tolua_to.c.s @@ -274,7 +288,7 @@ src/lib/tolua_to.s: src/lib/tolua_to.c.s # target to generate assembly for a file src/lib/tolua_to.c.s: - cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolua.dir/build.make lib/tolua++/CMakeFiles/tolua.dir/src/lib/tolua_to.c.s + cd /home/tycho/MCServer && $(MAKE) -f lib/tolua++/CMakeFiles/tolualib.dir/build.make lib/tolua++/CMakeFiles/tolualib.dir/src/lib/tolua_to.c.s .PHONY : src/lib/tolua_to.c.s # Help Target @@ -286,6 +300,7 @@ help: @echo "... edit_cache" @echo "... rebuild_cache" @echo "... tolua" + @echo "... tolualib" @echo "... src/bin/tolua.o" @echo "... src/bin/tolua.i" @echo "... src/bin/tolua.s" diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 500fae609..469daddec 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -16,4 +16,4 @@ include_directories ("${PROJECT_SOURCE_DIR}/../") #add cpp files here add_library(Bindings PluginManager LuaState WebPlugin Bindings ManualBindings LuaWindow Plugin PluginLua WebPlugin) -target_link_libraries(Bindings lua sqlite) +target_link_libraries(Bindings lua sqlite tolualib) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6ea2eb740..bdb1a8a57 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,4 +34,4 @@ add_executable(../MCServer/MCServer ${SOURCE}) target_link_libraries(../MCServer/MCServer OSSupport HTTPServer iniFile Bindings Items Blocks) target_link_libraries(../MCServer/MCServer Protocol Generating WorldStorage jsoncpp cryptopp) -target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib lua BlockEntities) +target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib lua BlockEntities luaexpat) |