diff --git a/.gitignore b/.gitignore index b3ffba9..76cde60 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,8 @@ .cache/ build/ +build-windows/ +build-linux/ +build-ios/ +build-mac/ +build-android/ diff --git a/.vscode/launch.json b/.vscode/launch.json index b048367..c4505ce 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,10 +8,10 @@ "name": "(Windows) Launch", "type": "cppvsdbg", "request": "launch", - "program": "${workspaceFolder}/build/bin/Debug/IAEngineRuntimeWin.exe", + "program": "${workspaceFolder}/build/bin/Debug/IAERuntime.exe", "args": [], "stopAtEntry": false, - "cwd": "${fileDirname}", + "cwd": "${workspaceFolder}", "environment": [], "console": "externalTerminal", "preLaunchTask": "CMake: build" diff --git a/Engine/Src/Inc/IAEngine/Base.hpp b/Engine/Src/Inc/IAEngine/Base.hpp index 7df7556..132b304 100644 --- a/Engine/Src/Inc/IAEngine/Base.hpp +++ b/Engine/Src/Inc/IAEngine/Base.hpp @@ -30,11 +30,12 @@ #include #include -#define IAE_LOG_TAG "[IAE]: " +#define IAE_LOG_TAG "IAE" #define IAE_LOG_INFO(...) ia::Logger::Info(IAE_LOG_TAG, __VA_ARGS__) #define IAE_LOG_WARN(...) ia::Logger::Warn(IAE_LOG_TAG, __VA_ARGS__) #define IAE_LOG_ERROR(...) ia::Logger::Error(IAE_LOG_TAG, __VA_ARGS__) +#define IAE_LOG_SUCCESS(...) ia::Logger::Success(IAE_LOG_TAG, __VA_ARGS__) namespace ia::iae { diff --git a/Runtime/Android/CMakeLists.txt b/Runtime/Android/CMakeLists.txt index e69de29..f11e641 100644 --- a/Runtime/Android/CMakeLists.txt +++ b/Runtime/Android/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SRC_FILES + "Src/Imp/CPP/Main.cpp" +) + +add_library(IAERuntime SHARED ${SRC_FILES}) + +target_link_libraries(IAERuntime PRIVATE IAEngine nlohmann_json SDL3::SDL3) diff --git a/Runtime/Android/Src/Imp/CPP/Main.cpp b/Runtime/Android/Src/Imp/CPP/Main.cpp new file mode 100644 index 0000000..e69de29 diff --git a/Runtime/Windows/CMakeLists.txt b/Runtime/Windows/CMakeLists.txt index 9ac2cfa..6f29855 100644 --- a/Runtime/Windows/CMakeLists.txt +++ b/Runtime/Windows/CMakeLists.txt @@ -2,6 +2,6 @@ set(SRC_FILES "Src/Imp/CPP/Main.cpp" ) -add_executable(IAEngineRuntimeWin ${SRC_FILES}) +add_executable(IAERuntime ${SRC_FILES}) -target_link_libraries(IAEngineRuntimeWin PRIVATE IAEngine nlohmann_json SDL3::SDL3) +target_link_libraries(IAERuntime PRIVATE IAEngine nlohmann_json SDL3::SDL3) diff --git a/Tools/BuildAndroid.bat b/Tools/BuildAndroid.bat new file mode 100644 index 0000000..f4cf129 --- /dev/null +++ b/Tools/BuildAndroid.bat @@ -0,0 +1 @@ +cmake -S . -B ./build-android -DCMAKE_TOOLCHAIN_FILE="$NDK_PATH\build\cmake\android.toolchain.cmake" -DANDROID_ABI=x86_64 diff --git a/Vendor/CMakeLists.txt b/Vendor/CMakeLists.txt index 304de52..12f25b8 100644 --- a/Vendor/CMakeLists.txt +++ b/Vendor/CMakeLists.txt @@ -81,15 +81,15 @@ add_subdirectory(json/) # ----------------------------------------------- # NativeFileDialog # ----------------------------------------------- -add_library( - NFD STATIC - - "nativefiledialog/src/nfd_common.c" - "nativefiledialog/src/nfd_win.cpp" -) -target_include_directories( - NFD PUBLIC - - "nativefiledialog/src/include" -) +#add_library( +# NFD STATIC +# +# "nativefiledialog/src/nfd_common.c" +# "nativefiledialog/src/nfd_win.cpp" +#) +#target_include_directories( +# NFD PUBLIC +# +# "nativefiledialog/src/include" +#) diff --git a/Vendor/IACore b/Vendor/IACore index 66299a7..a73cc7e 160000 --- a/Vendor/IACore +++ b/Vendor/IACore @@ -1 +1 @@ -Subproject commit 66299a7cafbda745f270a1cd9f823a6b21452703 +Subproject commit a73cc7e69c42beafc67c11c509f0c69c5445728f diff --git a/Engine/Src/Imp/CPP/Renderer/imgui.ini b/imgui.ini similarity index 100% rename from Engine/Src/Imp/CPP/Renderer/imgui.ini rename to imgui.ini