diff --git a/.gitignore b/.gitignore
index a22892fc..b52d20e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
+.favorites.json
build/
.cache/
.vscode/
+disasm/
+src/etc
src/lib/SDL2
src/lib/cmake
src/lib/GL
@@ -17,3 +20,13 @@ src/lib/libSDL2main.a
checks.json
assets/lib/libasar.dll
cmake/yaze.plist.in
+etc/
+latex/
+html/
+docs/zarby_algos.md
+docs/overworld-expansion.md
+assets/asm/EditorCore.asm
+src/app/emu/cpu/internal/old_cpu.cc
+build-windows
+src/lib/libpng
+src/lib/zlib
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 924a7ae5..d99e398c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,13 +141,12 @@ target_include_directories(
lib/
app/
${CMAKE_SOURCE_DIR}/src/
- ${CMAKE_SOURCE_DIR}/src/lib/imgui_test_engine
${PNG_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR}
)
target_link_libraries(
- yaze_c PUBLIC
+ yaze_c PRIVATE
${ABSL_TARGETS}
${SDL_TARGETS}
${PNG_LIBRARIES}
diff --git a/src/ios/yaze.xcodeproj/project.pbxproj b/src/ios/yaze.xcodeproj/project.pbxproj
index 24078550..63d4be52 100644
--- a/src/ios/yaze.xcodeproj/project.pbxproj
+++ b/src/ios/yaze.xcodeproj/project.pbxproj
@@ -6105,11 +6105,21 @@
DEVELOPMENT_TEAM = SN8Z922TT6;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GCC_C_LANGUAGE_STANDARD = c17;
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "DEBUG=1",
+ "$(inherited)",
+ "YAZE_LIB_PNG=1",
+ );
+ "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
+ "DEBUG=1",
+ "$(inherited)",
+ );
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "$(SRCROOT)/iOS/Info-iOS.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Yet Another Zelda3 Editor";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
+ INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
IPHONEOS_DEPLOYMENT_TARGET = 17.5;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@@ -6151,6 +6161,7 @@
INFOPLIST_KEY_CFBundleDisplayName = "Yet Another Zelda3 Editor";
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
+ INFOPLIST_PREPROCESSOR_DEFINITIONS = "";
IPHONEOS_DEPLOYMENT_TARGET = 17.5;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
diff --git a/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate b/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate
index 47410073..bd250335 100644
Binary files a/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate and b/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist b/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist
index 1ea3e2d7..3ae8a307 100644
--- a/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -27,12 +27,12 @@
yaze_ios.xcscheme_^#shared#^_
orderHint
- 7
+ 8
yaze_macos.xcscheme_^#shared#^_
orderHint
- 10
+ 7