diff --git a/SimpleTileMovementSystem/CMakeLists.txt b/SimpleTileMovementSystem/CMakeLists.txt index d691f18..604f1bc 100644 --- a/SimpleTileMovementSystem/CMakeLists.txt +++ b/SimpleTileMovementSystem/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/include) include_directories(include) include_directories(${CMAKE_INSTALL_PREFIX}/lua53/include) #linking-directory -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/lua53/bin/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/lua53/lib/) #targets add_executable(${PROJECT_NAME} ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) add_library(${PROJECT_NAME}-lib SHARED ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) diff --git a/action-system/CMakeLists.txt b/action-system/CMakeLists.txt index cde61ea..cf80568 100644 --- a/action-system/CMakeLists.txt +++ b/action-system/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/include) include_directories(include) include_directories(${CMAKE_INSTALL_PREFIX}/lua53/include) #linking-directory -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/lua53/bin/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/lua53/lib/) #targets add_executable(${PROJECT_NAME} ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) add_library(${PROJECT_NAME}-lib SHARED ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) diff --git a/s2dge-tilepos-adapter/CMakeLists.txt b/s2dge-tilepos-adapter/CMakeLists.txt index d5d487b..3685682 100644 --- a/s2dge-tilepos-adapter/CMakeLists.txt +++ b/s2dge-tilepos-adapter/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/include) include_directories(include) include_directories(${CMAKE_INSTALL_PREFIX}/lua53/include) #linking-directory -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/lua53/bin/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/lua53/lib/) #targets add_executable(${PROJECT_NAME} ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) add_library(${PROJECT_NAME}-lib SHARED ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) diff --git a/simple-position-system/CMakeLists.txt b/simple-position-system/CMakeLists.txt index 457930a..12300bb 100644 --- a/simple-position-system/CMakeLists.txt +++ b/simple-position-system/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/include) include_directories(include) include_directories(${CMAKE_INSTALL_PREFIX}/lua53/include) #linking-directory -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/lua53/bin/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/lua53/lib/) #targets add_executable(${PROJECT_NAME} ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) add_library(${PROJECT_NAME}-lib SHARED ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) diff --git a/simple-position-system/include/tile-position-system.hpp b/simple-position-system/include/tile-position-system.hpp index c705029..9f8f127 100644 --- a/simple-position-system/include/tile-position-system.hpp +++ b/simple-position-system/include/tile-position-system.hpp @@ -36,8 +36,8 @@ class TilePositionSystem : public GameSystem { Vector GetDependencies() override; ~TilePositionSystem(); private: - TilePositionSystem (const &TilePositionSystem){} - TilePositionSystem& operator=(const &TilePositionSystem){} + TilePositionSystem(const TilePositionSystem&){} + TilePositionSystem& operator=(const TilePositionSystem&){ return *this; } void HandleCursorMovement(); void HandleHorizontaCursorlMovement(); void UpdateSelectedObjects(); diff --git a/srpg-engine-test/CMakeLists.txt b/srpg-engine-test/CMakeLists.txt index b6b5ded..5207011 100644 --- a/srpg-engine-test/CMakeLists.txt +++ b/srpg-engine-test/CMakeLists.txt @@ -12,12 +12,12 @@ include_directories(${CMAKE_INSTALL_PREFIX}/s2dge-tilepos-adapter/include) include_directories(${CMAKE_INSTALL_PREFIX}/simple-tile-movement-system/include) message(${CMAKE_INSTALL_PREFIX}/lua53/include) #linking-directory -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-s2dge-system/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/simple-position-system/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/lua53/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/s2dge-tilepos-adapter/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/simple-tile-movement-system/bin/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-s2dge-system/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/simple-position-system/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/lua53/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/s2dge-tilepos-adapter/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/simple-tile-movement-system/lib/) #targets add_executable(${PROJECT_NAME} ${SRC_LIST}) diff --git a/srpg-engine/CMakeLists.txt b/srpg-engine/CMakeLists.txt index 5928102..9a3d1b8 100644 --- a/srpg-engine/CMakeLists.txt +++ b/srpg-engine/CMakeLists.txt @@ -2,6 +2,8 @@ project(srpg-engine) cmake_minimum_required(VERSION 3.1) set (CMAKE_CXX_STANDARD 14) +# Add compiler flags to handle template ambiguity issues in SOL2 +add_compile_options(-Wno-error -fpermissive) #sources aux_source_directory(. SRC_LIST) aux_source_directory(./src GENERAL_LIST) @@ -12,7 +14,7 @@ include_directories( #${CMAKE_INSTALL_PREFIX}/sol2 ./include) #linking dir -link_directories(${CMAKE_INSTALL_PREFIX}/lua53/bin) +link_directories(${CMAKE_INSTALL_PREFIX}/lua53/lib) #sources FILE(GLOB_RECURSE HEADERS (*.hpp) diff --git a/srpg-engine/include/common.hpp b/srpg-engine/include/common.hpp index 3381218..fd6fec8 100644 --- a/srpg-engine/include/common.hpp +++ b/srpg-engine/include/common.hpp @@ -7,6 +7,7 @@ #include #include #include +#include namespace SrpgEngine { namespace Framework { diff --git a/srpg-engine/include/sol.hpp b/srpg-engine/include/sol.hpp index 95f0e17..376bb3b 100644 --- a/srpg-engine/include/sol.hpp +++ b/srpg-engine/include/sol.hpp @@ -6485,7 +6485,7 @@ namespace sol { } static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) { - return stack::push(L, str, str + sz); + return pusher::push(L, str, str + sz); } }; @@ -6496,7 +6496,7 @@ namespace sol { } static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) { - return stack::push(L, str, str + sz); + return pusher::push(L, str, str + sz); } }; @@ -6507,7 +6507,7 @@ namespace sol { } static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) { - return stack::push(L, str, str + sz); + return pusher::push(L, str, str + sz); } }; diff --git a/srpg-s2dge-system/CMakeLists.txt b/srpg-s2dge-system/CMakeLists.txt index 4573c6a..e59674a 100644 --- a/srpg-s2dge-system/CMakeLists.txt +++ b/srpg-s2dge-system/CMakeLists.txt @@ -11,8 +11,8 @@ include_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/include) include_directories(include) include_directories(${CMAKE_INSTALL_PREFIX}/lua53/include) #linking-directory -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/bin/) -link_directories(${CMAKE_INSTALL_PREFIX}/lua53/bin/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/lib/) +link_directories(${CMAKE_INSTALL_PREFIX}/lua53/lib/) #targets add_executable(${PROJECT_NAME} ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) add_library(${PROJECT_NAME}-lib SHARED ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) diff --git a/srpg-sqlite-loader-system/CMakeLists.txt b/srpg-sqlite-loader-system/CMakeLists.txt index aee3132..91d169c 100644 --- a/srpg-sqlite-loader-system/CMakeLists.txt +++ b/srpg-sqlite-loader-system/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories(${CMAKE_INSTALL_PREFIX}/sqlite/include) include_directories(include) #linking-directory link_directories(${CMAKE_INSTALL_PREFIX}/sqlite/bin) -link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/bin/) +link_directories(${CMAKE_INSTALL_PREFIX}/srpg-engine/lib/) #targets add_executable(${PROJECT_NAME} ${SRC_LIST} ${GENERAL_LIST} ${HEADERS}) add_library(${PROJECT_NAME}-lib SHARED ${SRC_LIST} ${GENERAL_LIST} ${HEADERS})