-
Notifications
You must be signed in to change notification settings - Fork 118
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1f5c5b3
commit bb1c503
Showing
2 changed files
with
128 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -58,12 +58,14 @@ | ||
find_package(SDL2_image REQUIRED) | ||
find_package(PNG REQUIRED) | ||
find_package(JPEG REQUIRED) | ||
+find_package(nlohmann_json REQUIRED) | ||
+find_package(spdlog REQUIRED) | ||
+find_package(utf8cpp REQUIRED) | ||
|
||
include_directories(${SDL2_INCLUDE_DIR}) | ||
include_directories(${SDL2_MIXER_INCLUDE_DIR}) | ||
include_directories(${SDL2_IMAGE_INCLUDE_DIR}) | ||
include_directories(${PNG_PNG_INCLUDE_DIR}) | ||
-include_directories("${nx_SOURCE_DIR}/deps") | ||
|
||
file(GLOB APP_SOURCES "src/[a-zA-Z]*.cpp") | ||
file(GLOB TB_SOURCES "src/TextBox/[a-zA-Z]*.cpp") | ||
@@ -128,7 +130,7 @@ | ||
add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}/nxengine/data/") | ||
ENDIF() | ||
ENDIF() | ||
- target_link_libraries(nx ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY}) | ||
+ target_link_libraries(nx ${SDL2_LIBRARY} ${SDL2_MIXER_LIBRARY} ${SDL2_IMAGE_LIBRARY} ${PNG_LIBRARY} ${JPEG_LIBRARY} spdlog::spdlog utf8cpp::utf8cpp nlohmann_json::nlohmann_json) | ||
|
||
ELSEIF(PLATFORM STREQUAL "vita") | ||
add_definitions("-std=gnu++11") | ||
@@ -193,7 +193,7 @@ | ||
|
||
IF(PLATFORM STREQUAL "pc") | ||
add_executable(extract ${EXTR_SOURCES}) | ||
- target_link_libraries(extract ${SDL2_LIBRARY}) | ||
+ target_link_libraries(extract ${SDL2_LIBRARY} spdlog::spdlog) | ||
set_property(TARGET extract PROPERTY OUTPUT_NAME nxextract) | ||
|
||
install(TARGETS nx extract RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
--- a/src/i18n/translate.cpp | ||
+++ b/src/i18n/translate.cpp | ||
@@ -5,7 +5,7 @@ | ||
#include "../Utils/Logger.h" | ||
#include "minibidi.h" | ||
|
||
-#include <json.hpp> | ||
+#include <nlohmann/json.hpp> | ||
#include <utf8.h> | ||
#include <fstream> | ||
|
||
--- a/src/sound/SoundManager.cpp | ||
+++ b/src/sound/SoundManager.cpp | ||
@@ -9,7 +9,7 @@ | ||
#include "Organya.h" | ||
#include "Pixtone.h" | ||
|
||
-#include <json.hpp> | ||
+#include <nlohmann/json.hpp> | ||
#include <fstream> | ||
#include <iostream> | ||
|
||
--- a/src/graphics/Font.cpp | ||
+++ b/src/graphics/Font.cpp | ||
@@ -10,7 +10,7 @@ | ||
#include "../nx.h" | ||
|
||
#include <SDL_image.h> | ||
-#include <json.hpp> | ||
+#include <nlohmann/json.hpp> | ||
#include <utf8.h> | ||
#include <fstream> | ||
#include <iostream> | ||
--- a/src/ResourceManager.cpp | ||
+++ b/src/ResourceManager.cpp | ||
@@ -21,7 +21,7 @@ | ||
#include "common/misc.h" | ||
#include "settings.h" | ||
|
||
-#include <json.hpp> | ||
+#include <nlohmann/json.hpp> | ||
|
||
bool ResourceManager::fileExists(const std::string &filename) | ||
{ | ||
--- a/src/map.cpp | ||
+++ b/src/map.cpp | ||
@@ -18,7 +18,7 @@ | ||
#include "player.h" | ||
#include "settings.h" | ||
|
||
-#include <json.hpp> | ||
+#include <nlohmann/json.hpp> | ||
#include <fstream> | ||
|
||
stMap map; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
pkgname = "nxengine-evo" | ||
# change source on update | ||
pkgver = "2.6.5.1" | ||
pkgrel = 0 | ||
build_style = "cmake" | ||
hostmakedepends = [ | ||
"cmake", | ||
"ninja", | ||
] | ||
makedepends = [ | ||
"libjpeg-turbo-devel", | ||
"libpng-devel", | ||
"nlohmann-json", | ||
"sdl-devel", | ||
"sdl_image-devel", | ||
"sdl_mixer-devel", | ||
"spdlog-devel", | ||
"utfcpp", | ||
] | ||
pkgdesc = "Open-source rewrite of the Cave Story engine" | ||
maintainer = "tulilirockz <[email protected]>" | ||
license = "GPL-3.0-or-later" | ||
url = "https://github.com/nxengine/nxengine-evo" | ||
source = [ | ||
f"{url}/archive/refs/tags/v2.6.5-1.tar.gz", | ||
f"{url}/releases/download/v2.6.5-1/NXEngine-Evo-v2.6.5-1-Win64.zip", | ||
] | ||
source_paths = [".", "win"] | ||
sha256 = [ | ||
"db9b78b0c4005959ab8f3a6a05c02d86e764e6593cdd11a2178c581bb03a0699", | ||
"b7f8b57e555ac84a75f436100e395719153102b1b8a7238349957b5734dafd0d", | ||
] | ||
|
||
|
||
def post_install(self): | ||
self.uninstall("usr/share/nxengine/data") | ||
self.install_files("win/data", "usr/share/nxengine") |