From bf2bb7449b8d9f6129955c4212f2f5aa07c21f23 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 22 Feb 2014 00:30:20 -0800 Subject: [PATCH] move bindings into src/ make the code compile from scratch again. --- cmake | 2 +- src/CMakeLists.txt | 43 ++++++++++++++++++++++-- src/{bindings => }/bind_attrib.c | 3 +- src/{bindings => }/bind_attrib.h | 0 src/{bindings => }/bind_building.c | 0 src/{bindings => }/bind_building.h | 0 src/{bindings => }/bind_eressea.c | 0 src/{bindings => }/bind_eressea.h | 0 src/{bindings => }/bind_faction.c | 0 src/{bindings => }/bind_faction.h | 0 src/{bindings => }/bind_gmtool.c | 0 src/{bindings => }/bind_gmtool.h | 0 src/{bindings => }/bind_hashtable.c | 0 src/{bindings => }/bind_hashtable.h | 0 src/{bindings => }/bind_message.c | 0 src/{bindings => }/bind_message.h | 0 src/{bindings => }/bind_monsters.c | 0 src/{bindings => }/bind_process.c | 0 src/{bindings => }/bind_process.h | 0 src/{bindings => }/bind_region.c | 0 src/{bindings => }/bind_region.h | 0 src/{bindings => }/bind_settings.c | 0 src/{bindings => }/bind_settings.h | 0 src/{bindings => }/bind_ship.c | 0 src/{bindings => }/bind_ship.h | 0 src/{bindings => }/bind_sqlite.c | 0 src/{bindings => }/bind_storage.c | 0 src/{bindings => }/bind_storage.h | 0 src/{bindings => }/bind_unit.c | 0 src/{bindings => }/bind_unit.h | 0 src/{bindings => }/bindings.c | 0 src/{bindings => }/bindings.h | 0 src/bindings/CMakeLists.txt | 51 ----------------------------- src/{bindings => }/eressea.pkg | 0 src/{bindings => }/helpers.c | 0 src/{bindings => }/helpers.h | 0 src/main.c | 2 +- src/{bindings => }/process.pkg | 0 src/{bindings => }/settings.pkg | 0 39 files changed, 45 insertions(+), 56 deletions(-) rename src/{bindings => }/bind_attrib.c (99%) rename src/{bindings => }/bind_attrib.h (100%) rename src/{bindings => }/bind_building.c (100%) rename src/{bindings => }/bind_building.h (100%) rename src/{bindings => }/bind_eressea.c (100%) rename src/{bindings => }/bind_eressea.h (100%) rename src/{bindings => }/bind_faction.c (100%) rename src/{bindings => }/bind_faction.h (100%) rename src/{bindings => }/bind_gmtool.c (100%) rename src/{bindings => }/bind_gmtool.h (100%) rename src/{bindings => }/bind_hashtable.c (100%) rename src/{bindings => }/bind_hashtable.h (100%) rename src/{bindings => }/bind_message.c (100%) rename src/{bindings => }/bind_message.h (100%) rename src/{bindings => }/bind_monsters.c (100%) rename src/{bindings => }/bind_process.c (100%) rename src/{bindings => }/bind_process.h (100%) rename src/{bindings => }/bind_region.c (100%) rename src/{bindings => }/bind_region.h (100%) rename src/{bindings => }/bind_settings.c (100%) rename src/{bindings => }/bind_settings.h (100%) rename src/{bindings => }/bind_ship.c (100%) rename src/{bindings => }/bind_ship.h (100%) rename src/{bindings => }/bind_sqlite.c (100%) rename src/{bindings => }/bind_storage.c (100%) rename src/{bindings => }/bind_storage.h (100%) rename src/{bindings => }/bind_unit.c (100%) rename src/{bindings => }/bind_unit.h (100%) rename src/{bindings => }/bindings.c (100%) rename src/{bindings => }/bindings.h (100%) delete mode 100755 src/bindings/CMakeLists.txt rename src/{bindings => }/eressea.pkg (100%) rename src/{bindings => }/helpers.c (100%) rename src/{bindings => }/helpers.h (100%) rename src/{bindings => }/process.pkg (100%) rename src/{bindings => }/settings.pkg (100%) diff --git a/cmake b/cmake index ddd0136d4..923b5e365 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ddd0136d4e99b0daab16361aad5338ad3ca4b808 +Subproject commit 923b5e3651c8849fb0769e158447d24646a11cca diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0722cd8c2..1b2e7fec7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,12 +29,33 @@ add_subdirectory(util) add_subdirectory(kernel) add_subdirectory(items) add_subdirectory(attributes) -add_subdirectory(bindings) add_subdirectory(spells) add_subdirectory(triggers) add_subdirectory(modules) add_subdirectory(races) +MACRO(ADD_LUA_MODULE MODULE_NAME FILES) + ADD_LIBRARY (${MODULE_NAME} SHARED ${FILES}) + SET_TARGET_PROPERTIES(${MODULE_NAME} + PROPERTIES + PREFIX "" + ) +ENDMACRO(ADD_LUA_MODULE) + +MACRO(TOLUA_BINDING PKGFILE FILES) + ADD_CUSTOM_COMMAND( + OUTPUT ${PKGFILE}.c + DEPENDS ${FILES} ${PKGFILE} + COMMAND ${TOLUA_EXECUTABLE} + ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/${PKGFILE}.c ${PKGFILE} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) +ENDMACRO(TOLUA_BINDING) + +TOLUA_BINDING(process.pkg bind_process.h) +TOLUA_BINDING(eressea.pkg bind_eressea.h) +TOLUA_BINDING(settings.pkg bind_settings.h) + set(TESTS laws_test.c economy_test.c @@ -42,6 +63,9 @@ set(TESTS ) set (SERVER_SRC + process.pkg.c + eressea.pkg.c + settings.pkg.c eressea.c archetype.c creation.c @@ -60,7 +84,22 @@ set (SERVER_SRC xmlreport.c gmtool.c monsters.c - ${BINDINGS_SRC} + bind_building.c + bind_eressea.c + bind_faction.c + bind_gmtool.c + bind_hashtable.c + bindings.c + helpers.c + bind_message.c + bind_monsters.c + bind_process.c + bind_region.c + bind_settings.c + bind_ship.c + bind_sqlite.c + bind_storage.c + bind_unit.c ${SPELLS_SRC} ${RACES_SRC} ${ITEMS_SRC} diff --git a/src/bindings/bind_attrib.c b/src/bind_attrib.c similarity index 99% rename from src/bindings/bind_attrib.c rename to src/bind_attrib.c index c3297248a..424f7a82f 100644 --- a/src/bindings/bind_attrib.c +++ b/src/bind_attrib.c @@ -23,7 +23,8 @@ without prior permission by the authors of Eressea. #include #include #include -#include + +#include /* external libraries */ #include diff --git a/src/bindings/bind_attrib.h b/src/bind_attrib.h similarity index 100% rename from src/bindings/bind_attrib.h rename to src/bind_attrib.h diff --git a/src/bindings/bind_building.c b/src/bind_building.c similarity index 100% rename from src/bindings/bind_building.c rename to src/bind_building.c diff --git a/src/bindings/bind_building.h b/src/bind_building.h similarity index 100% rename from src/bindings/bind_building.h rename to src/bind_building.h diff --git a/src/bindings/bind_eressea.c b/src/bind_eressea.c similarity index 100% rename from src/bindings/bind_eressea.c rename to src/bind_eressea.c diff --git a/src/bindings/bind_eressea.h b/src/bind_eressea.h similarity index 100% rename from src/bindings/bind_eressea.h rename to src/bind_eressea.h diff --git a/src/bindings/bind_faction.c b/src/bind_faction.c similarity index 100% rename from src/bindings/bind_faction.c rename to src/bind_faction.c diff --git a/src/bindings/bind_faction.h b/src/bind_faction.h similarity index 100% rename from src/bindings/bind_faction.h rename to src/bind_faction.h diff --git a/src/bindings/bind_gmtool.c b/src/bind_gmtool.c similarity index 100% rename from src/bindings/bind_gmtool.c rename to src/bind_gmtool.c diff --git a/src/bindings/bind_gmtool.h b/src/bind_gmtool.h similarity index 100% rename from src/bindings/bind_gmtool.h rename to src/bind_gmtool.h diff --git a/src/bindings/bind_hashtable.c b/src/bind_hashtable.c similarity index 100% rename from src/bindings/bind_hashtable.c rename to src/bind_hashtable.c diff --git a/src/bindings/bind_hashtable.h b/src/bind_hashtable.h similarity index 100% rename from src/bindings/bind_hashtable.h rename to src/bind_hashtable.h diff --git a/src/bindings/bind_message.c b/src/bind_message.c similarity index 100% rename from src/bindings/bind_message.c rename to src/bind_message.c diff --git a/src/bindings/bind_message.h b/src/bind_message.h similarity index 100% rename from src/bindings/bind_message.h rename to src/bind_message.h diff --git a/src/bindings/bind_monsters.c b/src/bind_monsters.c similarity index 100% rename from src/bindings/bind_monsters.c rename to src/bind_monsters.c diff --git a/src/bindings/bind_process.c b/src/bind_process.c similarity index 100% rename from src/bindings/bind_process.c rename to src/bind_process.c diff --git a/src/bindings/bind_process.h b/src/bind_process.h similarity index 100% rename from src/bindings/bind_process.h rename to src/bind_process.h diff --git a/src/bindings/bind_region.c b/src/bind_region.c similarity index 100% rename from src/bindings/bind_region.c rename to src/bind_region.c diff --git a/src/bindings/bind_region.h b/src/bind_region.h similarity index 100% rename from src/bindings/bind_region.h rename to src/bind_region.h diff --git a/src/bindings/bind_settings.c b/src/bind_settings.c similarity index 100% rename from src/bindings/bind_settings.c rename to src/bind_settings.c diff --git a/src/bindings/bind_settings.h b/src/bind_settings.h similarity index 100% rename from src/bindings/bind_settings.h rename to src/bind_settings.h diff --git a/src/bindings/bind_ship.c b/src/bind_ship.c similarity index 100% rename from src/bindings/bind_ship.c rename to src/bind_ship.c diff --git a/src/bindings/bind_ship.h b/src/bind_ship.h similarity index 100% rename from src/bindings/bind_ship.h rename to src/bind_ship.h diff --git a/src/bindings/bind_sqlite.c b/src/bind_sqlite.c similarity index 100% rename from src/bindings/bind_sqlite.c rename to src/bind_sqlite.c diff --git a/src/bindings/bind_storage.c b/src/bind_storage.c similarity index 100% rename from src/bindings/bind_storage.c rename to src/bind_storage.c diff --git a/src/bindings/bind_storage.h b/src/bind_storage.h similarity index 100% rename from src/bindings/bind_storage.h rename to src/bind_storage.h diff --git a/src/bindings/bind_unit.c b/src/bind_unit.c similarity index 100% rename from src/bindings/bind_unit.c rename to src/bind_unit.c diff --git a/src/bindings/bind_unit.h b/src/bind_unit.h similarity index 100% rename from src/bindings/bind_unit.h rename to src/bind_unit.h diff --git a/src/bindings/bindings.c b/src/bindings.c similarity index 100% rename from src/bindings/bindings.c rename to src/bindings.c diff --git a/src/bindings/bindings.h b/src/bindings.h similarity index 100% rename from src/bindings/bindings.h rename to src/bindings.h diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt deleted file mode 100755 index 02df502c1..000000000 --- a/src/bindings/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ -cmake_minimum_required(VERSION 2.6) -project (bindings C) - -MACRO(ADD_LUA_MODULE MODULE_NAME FILES) - ADD_LIBRARY (${MODULE_NAME} SHARED ${FILES}) - SET_TARGET_PROPERTIES(${MODULE_NAME} - PROPERTIES - PREFIX "" - ) -ENDMACRO(ADD_LUA_MODULE) - -MACRO(TOLUA_BINDING PKGFILE FILES) - ADD_CUSTOM_COMMAND( - OUTPUT ${PKGFILE}.c - DEPENDS ${FILES} ${PKGFILE} - COMMAND ${TOLUA_EXECUTABLE} - ARGS -o ${CMAKE_CURRENT_BINARY_DIR}/${PKGFILE}.c ${PKGFILE} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) -ENDMACRO(TOLUA_BINDING) - -TOLUA_BINDING(process.pkg bind_process.h) -TOLUA_BINDING(eressea.pkg bind_eressea.h) -TOLUA_BINDING(settings.pkg bind_settings.h) - -set (_FILES -process.pkg.c -eressea.pkg.c -settings.pkg.c -bind_process.c -bind_eressea.c -bind_settings.c -bind_building.c -bind_faction.c -bind_gmtool.c -bind_hashtable.c -bindings.c -bind_message.c -bind_monsters.c -bind_region.c -bind_ship.c -bind_sqlite.c -bind_storage.c -bind_unit.c -helpers.c -) - -FOREACH(_FILE ${_FILES}) - LIST(APPEND _SOURCES ${PROJECT_NAME}/${_FILE}) -ENDFOREACH(_FILE) -SET(BINDINGS_SRC ${_SOURCES} PARENT_SCOPE) diff --git a/src/bindings/eressea.pkg b/src/eressea.pkg similarity index 100% rename from src/bindings/eressea.pkg rename to src/eressea.pkg diff --git a/src/bindings/helpers.c b/src/helpers.c similarity index 100% rename from src/bindings/helpers.c rename to src/helpers.c diff --git a/src/bindings/helpers.h b/src/helpers.h similarity index 100% rename from src/bindings/helpers.h rename to src/helpers.h diff --git a/src/main.c b/src/main.c index 26ebbe0be..ddd81e4ff 100644 --- a/src/main.c +++ b/src/main.c @@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "eressea.h" #include "gmtool.h" -#include "bindings/bindings.h" +#include "bindings.h" #include "races/races.h" #include "spells/spells.h" #include "spells/borders.h" diff --git a/src/bindings/process.pkg b/src/process.pkg similarity index 100% rename from src/bindings/process.pkg rename to src/process.pkg diff --git a/src/bindings/settings.pkg b/src/settings.pkg similarity index 100% rename from src/bindings/settings.pkg rename to src/settings.pkg