Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SimpleTileMovementSystem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions action-system/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions s2dge-tilepos-adapter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions simple-position-system/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions simple-position-system/include/tile-position-system.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ class TilePositionSystem : public GameSystem {
Vector<string> 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();
Expand Down
12 changes: 6 additions & 6 deletions srpg-engine-test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 3 additions & 1 deletion srpg-engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions srpg-engine/include/common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <set>
#include <algorithm>
#include <functional>
#include <cstdint>

namespace SrpgEngine {
namespace Framework {
Expand Down
6 changes: 3 additions & 3 deletions srpg-engine/include/sol.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6485,7 +6485,7 @@ namespace sol {
}

static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) {
return stack::push<const wchar_t*>(L, str, str + sz);
return pusher<const wchar_t*>::push(L, str, str + sz);
}
};

Expand All @@ -6496,7 +6496,7 @@ namespace sol {
}

static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) {
return stack::push<const char16_t*>(L, str, str + sz);
return pusher<const char16_t*>::push(L, str, str + sz);
}
};

Expand All @@ -6507,7 +6507,7 @@ namespace sol {
}

static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) {
return stack::push<const char32_t*>(L, str, str + sz);
return pusher<const char32_t*>::push(L, str, str + sz);
}
};

Expand Down
4 changes: 2 additions & 2 deletions srpg-s2dge-system/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion srpg-sqlite-loader-system/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down