mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-05-28 17:16:29 +03:00
Fix Windows build.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -69,6 +69,7 @@ ecode.dmg
|
||||
/.ecode/.prjallowed
|
||||
/.cache/
|
||||
/compile_commands.json
|
||||
/bin/benchmarks*
|
||||
/bin/unit_tests/eepp*
|
||||
/bin/unit_tests/lib*
|
||||
/bin/unit_tests/output/*
|
||||
|
||||
@@ -1783,7 +1783,7 @@ class EE_API UINode : public Node {
|
||||
* @param Flag The flag bit to modify.
|
||||
* @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.
|
||||
|
||||
12
premake5.lua
12
premake5.lua
@@ -1761,12 +1761,6 @@ workspace "eepp"
|
||||
files { "src/benchmarks/*.cpp" }
|
||||
incdirs { "src/thirdparty" }
|
||||
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"
|
||||
kind "ConsoleApp"
|
||||
@@ -1776,12 +1770,6 @@ workspace "eepp"
|
||||
language "C++"
|
||||
files { "src/tests/unit_tests/*.cpp" }
|
||||
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
|
||||
dofile("external_projects.lua")
|
||||
|
||||
@@ -81,5 +81,3 @@ UTEST( Benchmark, InlineLayout ) {
|
||||
|
||||
Engine::destroySingleton();
|
||||
}
|
||||
|
||||
UTEST_MAIN()
|
||||
|
||||
3
src/benchmarks/main.cpp
Normal file
3
src/benchmarks/main.cpp
Normal file
@@ -0,0 +1,3 @@
|
||||
#include "../tests/unit_tests/utest.h"
|
||||
|
||||
UTEST_MAIN()
|
||||
@@ -1390,7 +1390,7 @@ UISkin* UINode::getSkin() const {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void UINode::writeFlag( const Uint32& Flag, const Uint32& Val ) {
|
||||
void UINode::writeFlag( const Uint64& Flag, const Uint32& Val ) {
|
||||
if ( Val )
|
||||
mFlags |= Flag;
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user