Skip to content

Commit 4b2e9a8

Browse files
committed
lets see what gh actions says
1 parent 83af12e commit 4b2e9a8

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

CMakeLists.txt

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,43 @@
11
cmake_minimum_required(VERSION 3.21)
22

3-
# Set C++ standard and project properties
43
set(CMAKE_CXX_STANDARD 20)
54
set(CMAKE_CXX_STANDARD_REQUIRED ON)
65
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
76
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
87

98
project(Geodify VERSION 1.0.0)
109

11-
# Collect source files
1210
file(GLOB_RECURSE SOURCES src/*.cpp)
1311

14-
# Define the shared library target
1512
add_library(${PROJECT_NAME} SHARED ${SOURCES})
1613

17-
# Ensure Geode SDK is available
1814
if (NOT DEFINED ENV{GEODE_SDK})
1915
message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
2016
else()
2117
message(STATUS "Found Geode: $ENV{GEODE_SDK}")
2218
endif()
2319

24-
# Special case for GitHub Actions
2520
if (DEFINED ENV{GITHUB_ACTIONS})
2621
message("Github Actions Build")
2722
add_definitions(-DGITHUB_ACTIONS)
2823
endif()
2924

30-
# Include CPM.cmake
3125
include("cmake/CPM.cmake")
3226

33-
# Fetch the external-hook-api package using the new CPM syntax
3427
CPMAddPackage(
3528
NAME external-hook-api
3629
GIT_REPOSITORY https://github.com/OmgRod/External-Hook-API.git
3730
GIT_TAG master
3831
)
32+
target_link_libraries(${PROJECT_NAME} external-hook-api)
3933

40-
# Add Geode SDK as a subdirectory
41-
add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
34+
CPMAddPackage(
35+
NAME nlohmann_json
36+
GIT_REPOSITORY https://github.com/nlohmann/json.git
37+
VERSION 3.11.3
38+
)
39+
target_link_libraries(${PROJECT_NAME} nlohmann_json::nlohmann_json)
4240

43-
# Link the external-hook-api target to your project
44-
target_link_libraries(${PROJECT_NAME} external-hook-api)
41+
add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
4542

46-
# Setup Geode module (if applicable)
4743
setup_geode_mod(${PROJECT_NAME})

src/layers/GYSettingSelectLayer.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <Geode/Geode.hpp>
22
#include <Geode/ui/ScrollLayer.hpp>
3-
#include <matjson.hpp>
3+
#include <json.hpp>
44
#include <filesystem>
55
#include <fstream>
66
#include <sstream>
@@ -134,7 +134,7 @@ bool GYSettingSelectLayer::init() {
134134
void GYSettingSelectLayer::generateWrapper(CCObject* sender) {
135135
generateModsList();
136136
}
137-
137+
/*
138138
bool GYSettingSelectLayer::generateModsList() {
139139
std::filesystem::path filePath = Mod::get()->getResourcesDir() / "layers.json";
140140
@@ -182,3 +182,4 @@ bool GYSettingSelectLayer::generateModsList() {
182182
183183
return true;
184184
}
185+
*/

0 commit comments

Comments
 (0)