Skip to content

Commit b379ee2

Browse files
committed
fix up CMake
1 parent 79d1a01 commit b379ee2

4 files changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/multi-platform.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
bindings-ref: main
4444
combine: true
4545
export-symbols: true
46-
sdk: nightly
4746
target: ${{ matrix.config.target }}
4847

4948
package:

CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.10)
1+
cmake_minimum_required(VERSION 3.21)
22
set(CMAKE_CXX_STANDARD 20)
33
set(CMAKE_CXX_STANDARD_REQUIRED ON)
44
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
@@ -14,6 +14,7 @@ project(SettingsPlus VERSION 1.0.0)
1414
add_library(${PROJECT_NAME} SHARED
1515
src/main.cpp
1616
src/SettingsLayer.cpp
17+
src/API.cpp
1718
# Add any extra C++ source files here
1819
)
1920

@@ -25,7 +26,4 @@ endif()
2526

2627
add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
2728

28-
CPMAddPackage("gh:camila314/uibuilder#c662f54")
29-
target_link_libraries(${PROJECT_NAME} UIBuilder)
30-
3129
setup_geode_mod(${PROJECT_NAME})

mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"geode": "5.0.0-beta.1",
2+
"geode": "5.0.0-beta.2",
33
"gd": {
44
"win": "2.2081",
55
"android": "2.2081",

src/SettingsLayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ bool SettingCell::init(std::string name, std::string gv, SettingCellType type) {
131131
input->setCallback([this](std::string offset) {
132132
auto res = geode::utils::numFromString<int>(offset).unwrapOr(0);
133133
FMODAudioEngine::get()->m_musicOffset = res;
134-
callCallbacks(m_gameVariable, (float)res);
134+
// callCallbacks(m_gameVariable, (float)res);
135135
});
136136
input->setPositionX(-25.f);
137137
input->setScale(0.75f);
@@ -177,7 +177,7 @@ void SettingCell::onSongSelect(CCObject* sender) {
177177

178178
void SettingCell::onCheckboxToggled(CCObject* sender) {
179179
GameManager::get()->setGameVariable(m_gameVariable.c_str(), !m_toggler->isOn());
180-
callCallbacks(m_gameVariable, !m_toggler->isOn());
180+
// callCallbacks(m_gameVariable, !m_toggler->isOn());
181181
// log::debug("set gv_{} to {}", m_gameVariable, !m_toggler->isOn());
182182
}
183183

0 commit comments

Comments
 (0)