diff --git a/README.md b/README.md index 3294e73..83cff14 100644 --- a/README.md +++ b/README.md @@ -23,18 +23,18 @@ Download SDK for your OS and drag bella_engine_sdk into your workdir. On Windows - [bella_engine_sdk Win](https://downloads.bellarender.com/bella_engine_sdk-24.6.0.zip) -# MacOS/Linux - -Linux dependencies -``` -apt install libx11-dev -apt install xorg-dev -``` - -cmake -DBUILD_SHARED_LIBS=OFF -DUSE_EXTERNAL_GLFW=OFF .. +# MacOS ``` +curl -LO https://github.com/Kitware/CMake/releases/download/v3.31.6/cmake-3.31.6-macos-universal.dmg +open cmake-3.31.6-macos-universal.dmgcurl -LO https://github.com/Kitware/CMake/releases/download/v3.31.6/cmake-3.31.6-macos-universal.dmg +open cmake-3.31.6-macos-universal.dmg +cd ~ +mkdir workdir cd workdir +curl -LO https://downloads.bellarender.com/bella_engine_sdk-24.6.0.dmg +hdiutil attach bella_engine_sdk-24.6.0.dmg +cp -R /Volumes/Bella\ Engine\ SDK\ 24.6.0/bella_engine_sdk . git clone https://github.com/raysan5/raylib.git mkdir -p raylib/build cd raylib/build @@ -42,17 +42,47 @@ cd raylib/build make -j4 cd ../.. git clone https://github.com/raysan5/raygui.git +git clone https://github.com/oomer/oom.git git clone https://github.com/oomer/poomer-raylib-bella_onimage.git cd poomer-raylib-bella_onimage make ``` +# Linux +``` +sudo apt install -y build-essential curl +sudo apt install libx11-dev +sudo apt install xorg-dev +cd ~ +mkdir workdir +cd workdir +curl -LO https://downloads.bellarender.com/bella_engine_sdk-24.6.0.tar.gz +tar -xvf bella_engine_sdk-24.6.0.tar.gz +git clone https://github.com/raysan5/raylib.git +mkdir -p raylib/build +cd raylib/build +cmake -DBUILD_SHARED_LIBS=ON -DUSE_EXTERNAL_GLFW=OFF .. +make -j4 +cd ../.. +git clone https://github.com/raysan5/raygui.git +git clone https://github.com/oomer/oom.git +git clone https://github.com/oomer/poomer-raylib-bella_onimage.git +cd poomer-raylib-bella_onimage +make +``` + + # Windows - Install Visual Studio Community 2022 - Add Desktop development with C++ workload - Launch x64 Native tools Command Prompt for VS2022 ``` -cd workdir +cd %USERPROFILE% +mkdir workdir +mkdir workdir\bella_engine_sdk +curl -LO https://downloads.bellarender.com/bella_engine_sdk-24.6.0.zip +tar -xf bella_engine_sdk-24.6.0.zip +cd .. git clone https://github.com/raysan5/raylib.git cd raylib mkdir build @@ -61,6 +91,8 @@ cmake .. msbuild raylib.sln /p:Configuration=Release cd ../.. git clone https://github.com/raysan5/raygui.git +git clone https://github.com/oomer/oom.git git clone https://github.com/oomer/poomer-raylib-bella_onimage.git +cd poomer-raylib-bella_onimage msbuild poomer-raylib-bella_onimage.vcxproj /p:Configuration=release /p:Platform=x64 /p:PlatformToolset=v143 ``` diff --git a/poomer-raylib-bella_onimage.cpp b/poomer-raylib-bella_onimage.cpp index 8583351..41ee6d3 100644 --- a/poomer-raylib-bella_onimage.cpp +++ b/poomer-raylib-bella_onimage.cpp @@ -24,8 +24,6 @@ static bool _init_env = (putenv((char*)objc_disable_warning), true); #include #include #include -// Include our fix header first -#include "raylib_objc_fix.h" // Include raylib directly but don't use its namespace #include #include // For thread synchronization @@ -723,4 +721,4 @@ int DL_main(dl::Args& args) std::cerr << "FATAL ERROR: Unknown exception in main" << std::endl; return 1; } -} \ No newline at end of file +} diff --git a/poomer-raylib-bella_onimage.vcxproj b/poomer-raylib-bella_onimage.vcxproj index 3372e31..0e6c8e0 100644 --- a/poomer-raylib-bella_onimage.vcxproj +++ b/poomer-raylib-bella_onimage.vcxproj @@ -48,6 +48,7 @@ Disabled Disabled ..\bella_engine_sdk\src;..\raylib\src;..\raygui\src + stdcpp17 Console @@ -65,6 +66,7 @@ false NDEBUG;_CONSOLE;DL_USE_SHARED;NOMINMAX;WIN32_LEAN_AND_MEAN;NOGDI;NOUSER;%(PreprocessorDefinitions) ..\bella_engine_sdk\src;..\raylib\src;..\raygui\src + stdcpp17 Console @@ -82,6 +84,7 @@ false _ALLOW_COMPILER_AND_STL_VERSION_MISMATCH;%(PreprocessorDefinitions) NoIPO + stdcpp17 false