Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-28 17:16:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows build.

Browse Source
This commit is contained in:
Martín Lucas Golini
2026-05-21 21:25:19 -03:00
parent ed333b3839
commit 0c742d6431
6 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -69,6 +69,7 @@ ecode.dmg
/.ecode/.prjallowed /.ecode/.prjallowed
/.cache/ /.cache/
/compile_commands.json /compile_commands.json
/bin/benchmarks*
/bin/unit_tests/eepp* /bin/unit_tests/eepp*
/bin/unit_tests/lib* /bin/unit_tests/lib*
/bin/unit_tests/output/* /bin/unit_tests/output/*

2
include/eepp/ui/uinode.hpp
View File

@@ -1783,7 +1783,7 @@ class EE_API UINode : public Node {
* @param Flag The flag bit to modify. * @param Flag The flag bit to modify.
* @param Val The value to set (1 to set, 0 to clear). * @param Val The value to set (1 to set, 0 to clear).
*/ */
void writeFlag( const Uint32& Flag, const Uint32& Val ); void writeFlag( const Uint64& Flag, const Uint32& Val );
/** /**
* @brief Creates padding rectangle from skin border size. * @brief Creates padding rectangle from skin border size.

18
premake5.lua
View File

@@ -1761,27 +1761,15 @@ workspace "eepp"
files { "src/benchmarks/*.cpp" } files { "src/benchmarks/*.cpp" }
incdirs { "src/thirdparty" } incdirs { "src/thirdparty" }
build_link_configuration( "eepp-benchmarks", true ) build_link_configuration( "eepp-benchmarks", true )
if table.contains(backends, "SDL2") then
defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_2" }
end
if table.contains(backends, "SDL3") then
defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_3" }
end
project "eepp-unit_tests" project "eepp-unit_tests"
kind "ConsoleApp" kind "ConsoleApp"
targetdir(_MAIN_SCRIPT_DIR .. "/bin/unit_tests") targetdir(_MAIN_SCRIPT_DIR .. "/bin/unit_tests")
links { "eterm-static", "languages-syntax-highlighting-static" } links { "eterm-static", "languages-syntax-highlighting-static" }
incdirs { "src/modules/eterm/include/", "src/thirdparty" } incdirs { "src/modules/eterm/include/", "src/thirdparty" }
language "C++" language "C++"
files { "src/tests/unit_tests/*.cpp" } files { "src/tests/unit_tests/*.cpp" }
build_link_configuration( "eepp-unit_tests", true ) build_link_configuration( "eepp-unit_tests", true )
if table.contains(backends, "SDL2") then
defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_2" }
end
if table.contains(backends, "SDL3") then
defines { "EE_BACKEND_SDL_ACTIVE", "EE_SDL_VERSION_3" }
end
if os.isfile("external_projects.lua") then if os.isfile("external_projects.lua") then
dofile("external_projects.lua") dofile("external_projects.lua")

2
src/benchmarks/inline_layout_benchmark.cpp
View File

@@ -81,5 +81,3 @@ UTEST( Benchmark, InlineLayout ) {
Engine::destroySingleton(); Engine::destroySingleton();
} }
UTEST_MAIN()

3
src/benchmarks/main.cpp Normal file
View File

@@ -0,0 +1,3 @@
#include "../tests/unit_tests/utest.h"
UTEST_MAIN()

2
src/eepp/ui/uinode.cpp
View File

@@ -1390,7 +1390,7 @@ UISkin* UINode::getSkin() const {
return NULL; return NULL;
} }
void UINode::writeFlag( const Uint32& Flag, const Uint32& Val ) { void UINode::writeFlag( const Uint64& Flag, const Uint32& Val ) {
if ( Val ) if ( Val )
mFlags |= Flag; mFlags |= Flag;
else { else {