first working win
This commit is contained in:
parent
be2bd24682
commit
0d6e8a7438
23
README.md
23
README.md
@ -14,13 +14,14 @@ workdir/
|
|||||||
|
|
||||||
Download SDK for your OS and drag bella_engine_sdk into your workdir
|
Download SDK for your OS and drag bella_engine_sdk into your workdir
|
||||||
|
|
||||||
[bella_engine_sdk MacOS](https://downloads.bellarender.com/bella_engine_sdk-24.6.0.dmg)
|
- [bella_engine_sdk MacOS](https://downloads.bellarender.com/bella_engine_sdk-24.6.0.dmg)
|
||||||
[bella_engine_sdk Linux](https://downloads.bellarender.com/bella_engine_sdk-24.6.0.tar.gz)
|
- [bella_engine_sdk Linux](https://downloads.bellarender.com/bella_engine_sdk-24.6.0.tar.gz)
|
||||||
[bella_engine_sdk Win](https://downloads.bellarender.com/bella_engine_sdk-24.6.0.zip)
|
- [bella_engine_sdk Win](https://downloads.bellarender.com/bella_engine_sdk-24.6.0.zip)
|
||||||
|
|
||||||
MacOS/Linux
|
|
||||||
|
|
||||||
extra linux
|
# MacOS/Linux
|
||||||
|
|
||||||
|
extra linux dependencies
|
||||||
```
|
```
|
||||||
apt install libx11-dev
|
apt install libx11-dev
|
||||||
apt install xorg-dev
|
apt install xorg-dev
|
||||||
@ -40,9 +41,17 @@ cd poomer-raylib-bella_onimage
|
|||||||
make
|
make
|
||||||
```
|
```
|
||||||
|
|
||||||
Windows
|
# Windows
|
||||||
```
|
```
|
||||||
[TODO] document how to build raylib
|
cd workdir
|
||||||
|
git clone https://github.com/raysan5/raylib.git
|
||||||
|
cd raylib
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
cmake ..
|
||||||
|
msbuild raylib.sln /p:Configuration=Release
|
||||||
|
cd ../..
|
||||||
|
git clone https://github.com/raysan5/raygui.git
|
||||||
git clone https://github.com/oomer/poomer-raylib-bella_onimage.git
|
git clone https://github.com/oomer/poomer-raylib-bella_onimage.git
|
||||||
msbuild poomer-raylib-bella_onimage.vcxproj /p:Configuration=release /p:Platform=x64 /p:PlatformToolset=v143
|
msbuild poomer-raylib-bella_onimage.vcxproj /p:Configuration=release /p:Platform=x64 /p:PlatformToolset=v143
|
||||||
```
|
```
|
||||||
@ -1,3 +1,14 @@
|
|||||||
|
// Add these definitions before any includes to prevent Windows API conflicts
|
||||||
|
#define NOMINMAX
|
||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#define NOGDI
|
||||||
|
#define NOUSER
|
||||||
|
|
||||||
|
// Include Windows.h first to gain control over its namespace
|
||||||
|
#if defined(_WIN32) || defined(_WIN64) || defined(WIN32) || defined(WIN64)
|
||||||
|
#include <windows.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
@ -20,7 +31,7 @@ namespace rl {
|
|||||||
using Vector2 = ::Vector2;
|
using Vector2 = ::Vector2;
|
||||||
using Color = ::Color;
|
using Color = ::Color;
|
||||||
|
|
||||||
// Add function aliases
|
// Add function aliases - make sure to include ALL raylib functions you use
|
||||||
using ::InitWindow;
|
using ::InitWindow;
|
||||||
using ::CloseWindow;
|
using ::CloseWindow;
|
||||||
using ::IsWindowReady;
|
using ::IsWindowReady;
|
||||||
@ -43,6 +54,7 @@ namespace rl {
|
|||||||
using ::GetMouseWheelMove;
|
using ::GetMouseWheelMove;
|
||||||
using ::IsMouseButtonPressed;
|
using ::IsMouseButtonPressed;
|
||||||
using ::IsMouseButtonReleased;
|
using ::IsMouseButtonReleased;
|
||||||
|
using ::ShowCursor;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Define a callback type for receiving image data from the path tracer
|
// Define a callback type for receiving image data from the path tracer
|
||||||
|
|||||||
@ -44,16 +44,16 @@
|
|||||||
<ClCompile>
|
<ClCompile>
|
||||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||||
<SDLCheck>false</SDLCheck>
|
<SDLCheck>false</SDLCheck>
|
||||||
<PreprocessorDefinitions>PSEUDODEBUG;_CONSOLE;DL_USE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>PSEUDODEBUG;_CONSOLE;DL_USE_SHARED;NOMINMAX;WIN32_LEAN_AND_MEAN;NOGDI;NOUSER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
|
<InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
|
||||||
<AdditionalIncludeDirectories>..\bella_engine_sdk\src;..\raylib\src;..\raygui\src</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\bella_engine_sdk-24.6.0\src;..\raylib\src;..\raygui\src</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalLibraryDirectories>lib;..\raylib\src</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>lib;..\raylib\build\raylib\Release</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>bella_engine_sdk.lib;raylib.lib;Shlwapi.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>bella_engine_sdk.lib;raylib.lib;Shlwapi.lib;vulkan-1.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<DelayLoadDLLs>vulkan-1.dll</DelayLoadDLLs>
|
<DelayLoadDLLs>vulkan-1.dll</DelayLoadDLLs>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
@ -63,16 +63,16 @@
|
|||||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<SDLCheck>false</SDLCheck>
|
<SDLCheck>false</SDLCheck>
|
||||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;DL_USE_SHARED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
<PreprocessorDefinitions>NDEBUG;_CONSOLE;DL_USE_SHARED;NOMINMAX;WIN32_LEAN_AND_MEAN;NOGDI;NOUSER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
<AdditionalIncludeDirectories>..\bella_engine_sdk\src;..\raylib\src;..\raygui\src</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>..\bella_engine_sdk-24.6.0\src;..\raylib\src;..\raygui\src</AdditionalIncludeDirectories>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<SubSystem>Console</SubSystem>
|
<SubSystem>Console</SubSystem>
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
<AdditionalLibraryDirectories>lib;..\raylib\src;..\bella_engine_sdk\lib</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>lib;..\raylib\build\raylib\Release;..\bella_engine_sdk-24.6.0\lib</AdditionalLibraryDirectories>
|
||||||
<AdditionalDependencies>bella_engine_sdk.lib;raylib.lib;Shlwapi.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
<AdditionalDependencies>bella_engine_sdk.lib;raylib.lib;Shlwapi.lib;vulkan-1.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
<DelayLoadDLLs>vulkan-1.dll</DelayLoadDLLs>
|
<DelayLoadDLLs>vulkan-1.dll</DelayLoadDLLs>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
@ -90,53 +90,50 @@
|
|||||||
<ItemDefinitionGroup>
|
<ItemDefinitionGroup>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>echo Post-build event started &
|
<Command>echo Post-build event started &
|
||||||
copy "$(ProjectDir)..\bella_engine_sdk\lib\bella_engine_sdk.dll" "$(TargetDir)" &
|
copy "$(ProjectDir)..\bella_engine_sdk-24.6.0\lib\bella_engine_sdk.dll" "$(TargetDir)" &
|
||||||
echo bella_engine_sdk.dll copied &
|
echo bella_engine_sdk.dll copied &
|
||||||
copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_core.dll" "$(TargetDir)" &
|
copy "$(ProjectDir)..\bella_engine_sdk-24.6.0\lib\dl_core.dll" "$(TargetDir)" &
|
||||||
echo dl_core.dll copied &
|
echo dl_core.dll copied &
|
||||||
copy "$(ProjectDir)..\bella_engine_sdk\lib\dl_oidn_core.dll" "$(TargetDir)" &
|
copy "$(ProjectDir)..\bella_engine_sdk-24.6.0\lib\dl_oidn_core.dll" "$(TargetDir)" &
|
||||||
echo dl_oidn_core.dll copied &
|
echo dl_oidn_core.dll copied &
|
||||||
copy "$(ProjectDir)..\raylib\src\raylib.dll" "$(TargetDir)" &
|
|
||||||
echo raylib.dll copied &
|
|
||||||
echo Post-build event finished</Command>
|
echo Post-build event finished</Command>
|
||||||
|
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\bella_sdk\api.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\bella_sdk\api.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_engine.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\bella_sdk\bella_engine.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_nodeapi.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\bella_sdk\bella_nodeapi.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_scene.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\bella_sdk\bella_scene.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_sceneapi.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\bella_sdk\bella_sceneapi.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\bella_sdk\bella_types.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\bella_sdk\bella_types.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\api.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\api.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_args.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_args.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_array.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_array.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_compress.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_compress.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_defines.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_defines.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_file.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_file.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_fs.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_fs.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_hash.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_hash.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_hashmap.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_hashmap.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_hw.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_hw.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_licensing.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_licensing.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_logging.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_logging.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_main.inl" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_main.inl" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_math.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_math.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_nullable.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_nullable.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_os.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_os.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_path.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_path.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_pcgrng.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_pcgrng.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_platform.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_platform.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_references.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_references.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_refvector.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_refvector.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_string.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_string.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_stringio.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_stringio.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_time.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_time.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_topomap.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_topomap.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_types.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_types.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_vector.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_vector.h" />
|
||||||
<ClInclude Include="..\bella_engine_sdk\src\dl_core\dl_version.h" />
|
<ClInclude Include="..\bella_engine_sdk-24.6.0\src\dl_core\dl_version.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="poomer-raylib-bella_onimage.cpp" />
|
<ClCompile Include="poomer-raylib-bella_onimage.cpp" />
|
||||||
@ -147,8 +144,8 @@
|
|||||||
<None Include="makefile" />
|
<None Include="makefile" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Library Include="..\bella_engine_sdk\lib\bella_engine_sdk.lib" />
|
<Library Include="..\bella_engine_sdk-24.6.0\lib\bella_engine_sdk.lib" />
|
||||||
<Library Include="..\raylib\src\raylib.lib" />
|
<Library Include="..\raylib\build\raylib\Release\raylib.lib" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Text Include="license.txt" />
|
<Text Include="license.txt" />
|
||||||
@ -159,3 +156,4 @@
|
|||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user