From 92a89abb65728d71aec489caa7b81ac150309603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Thu, 2 Jul 2020 16:37:20 -0300 Subject: [PATCH] Fixes and improvements for the windows build. --- .gitignore | 3 +- bin/assets/icon/ee.ico | Bin 32988 -> 18886 bytes premake5.lua | 7 +++++ projects/ios/SDL2-sensors.patch | 33 -------------------- projects/ios/compile-all.sh | 2 +- projects/ios/gen-xcode4-proj.sh | 4 +-- src/eepp/core/debug.cpp | 4 +-- src/eepp/system/sys.cpp | 2 +- src/eepp/window/backend/SDL2/windowsdl2.cpp | 5 +++ src/tools/codeeditor/codeeditor.cpp | 5 ++- 10 files changed, 21 insertions(+), 44 deletions(-) delete mode 100644 projects/ios/SDL2-sensors.patch diff --git a/.gitignore b/.gitignore index c96ba8b72..f64754ad5 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,7 @@ projects/android-project-ant/gen projects/android-project-ant/assets projects/android-project-ant/libs src/examples/strobe -src/thirdparty/SDL2-2.0.10* +src/thirdparty/SDL2-2.0.12* *.dll bin/ee* bin/eepp-* @@ -44,3 +44,4 @@ bin/libeepp.dylib eepp.kdev4 eepp.tags eepp.geany +/bin/assets/icon/ee.aps diff --git a/bin/assets/icon/ee.ico b/bin/assets/icon/ee.ico index 47dd3fd14ad3ab05398254dde3923345c646cb3e..df9268206cdd97a0701212fb97b4b99dbc0136cc 100644 GIT binary patch literal 18886 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 diff --git a/premake5.lua b/premake5.lua index cc7cec7b8..8061f620d 100644 --- a/premake5.lua +++ b/premake5.lua @@ -196,6 +196,10 @@ function build_link_configuration( package_name, use_ee_icon ) linkoptions { "../../bin/assets/icon/ee.res" } end + filter { "system:windows", "action:vs*" } + files { "bin/assets/icon/ee.rc", "bin/assets/icon/ee.ico" } + vpaths { ['Resources/*'] = { "ee.rc", "ee.ico" } } + filter "action:not vs*" cppdialect "C++14" buildoptions { "-Wall" } @@ -568,6 +572,9 @@ workspace "eepp" filter "configurations:release*" optimize "Speed" + filter { "system:windows", "action:vs*" } + flags { "MultiProcessorCompile" } + project "SOIL2-static" kind "StaticLib" language "C" diff --git a/projects/ios/SDL2-sensors.patch b/projects/ios/SDL2-sensors.patch deleted file mode 100644 index 29a8d4e72..000000000 --- a/projects/ios/SDL2-sensors.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/configure Mon Dec 30 17:56:56 2019 -0800 -+++ b/configure Tue Dec 31 10:40:30 2019 -0800 -@@ -25106,6 +25106,14 @@ - # have_haptic=yes - # EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" - #fi -+ # Set up files for the sensor library -+ if test x$enable_sensor = xyes; then -+ -+$as_echo "#define SDL_SENSOR_COREMOTION 1" >>confdefs.h -+ -+ SOURCES="$SOURCES $srcdir/src/sensor/coremotion/*.m" -+ have_sensor=yes -+ fi - # Set up files for the power library - if test x$enable_power = xyes; then - - ---- a/configure.ac Mon Dec 30 17:56:56 2019 -0800 -+++ b/configure.ac Tue Dec 31 10:40:30 2019 -0800 -@@ -3856,6 +3856,12 @@ - # have_haptic=yes - # EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,-framework,ForceFeedback" - #fi -+ # Set up files for the sensor library -+ if test x$enable_sensor = xyes; then -+ AC_DEFINE(SDL_SENSOR_COREMOTION, 1, [ ]) -+ SOURCES="$SOURCES $srcdir/src/sensor/coremotion/*.m" -+ have_sensor=yes -+ fi - # Set up files for the power library - if test x$enable_power = xyes; then - AC_DEFINE(SDL_POWER_UIKIT, 1, [ ]) diff --git a/projects/ios/compile-all.sh b/projects/ios/compile-all.sh index 0783040bb..209bf16a1 100755 --- a/projects/ios/compile-all.sh +++ b/projects/ios/compile-all.sh @@ -3,7 +3,7 @@ cd $(dirname "$0") if [ ! -f ../../libs/ios/libSDL2.a ]; then -cd ../../src/thirdparty/SDL2-2.0.10/build-scripts +cd ../../src/thirdparty/SDL2-2.0.12/build-scripts ./iosbuild.sh cp lib/libSDL2.a ../../../../libs/ios/ cd ../../../../projects/ios diff --git a/projects/ios/gen-xcode4-proj.sh b/projects/ios/gen-xcode4-proj.sh index ede9451ab..05a4c33b3 100755 --- a/projects/ios/gen-xcode4-proj.sh +++ b/projects/ios/gen-xcode4-proj.sh @@ -1,11 +1,11 @@ #!/bin/bash -premake5 --file=../../premake5.lua --os=ios --with-static-eepp --with-gles1 --with-gles2 --with-static-backend --use-frameworks xcode4 +premake5 --file=../../premake5.lua --os=ios --with-static-eepp --with-gles1 --with-gles2 --with-static-backend --use-frameworks xcode4 cp Info.plist ../../make/ios if [ ! -f ../../libs/ios/libSDL2.a ]; then -cd ../../src/thirdparty/SDL2-2.0.10/build-scripts +cd ../../src/thirdparty/SDL2-2.0.12/build-scripts ./iosbuild.sh cp lib/libSDL2.a ../../../../libs/ios/ diff --git a/src/eepp/core/debug.cpp b/src/eepp/core/debug.cpp index f904aa03d..ece39226d 100644 --- a/src/eepp/core/debug.cpp +++ b/src/eepp/core/debug.cpp @@ -18,12 +18,10 @@ namespace EE { bool PrintDebugInLog = true; void eeREPORT_ASSERT( const char* File, int Line, const char* Exp ) { -#ifdef EE_COMPILER_MSVC - +#if defined( EE_COMPILER_MSVC ) && defined( EE_DEBUG ) _CrtDbgReport( _CRT_ASSERT, File, Line, "", Exp ); DebugBreak(); - #else if ( PrintDebugInLog ) { diff --git a/src/eepp/system/sys.cpp b/src/eepp/system/sys.cpp index fceb2c92d..f73a33990 100644 --- a/src/eepp/system/sys.cpp +++ b/src/eepp/system/sys.cpp @@ -606,7 +606,7 @@ std::string Sys::getConfigPath( std::string appname ) { _dupenv_s( &ppath, &ssize, "APPDATA" ); - String::strCopy( path, ppath, EE_MAX_CFG_PATH_LEN ); + _snprintf( path, EE_MAX_CFG_PATH_LEN, "%s\\%s", ppath, appname.c_str() ); free( ppath ); diff --git a/src/eepp/window/backend/SDL2/windowsdl2.cpp b/src/eepp/window/backend/SDL2/windowsdl2.cpp index 35d2834bd..7115eeb41 100644 --- a/src/eepp/window/backend/SDL2/windowsdl2.cpp +++ b/src/eepp/window/backend/SDL2/windowsdl2.cpp @@ -695,6 +695,11 @@ bool WindowSDL::setIcon( const std::string& Path ) { Image Img( Path ); if ( NULL != Img.getPixelsPtr() ) { +#if EE_PLATFORM == EE_PLATFORM_WIN + if ( Img.getWidth() > 64 || Img.getHeight() > 64 ) { + Img.resize( 64, 64 ); + } +#endif const Uint8* Ptr = Img.getPixelsPtr(); x = Img.getWidth(); y = Img.getHeight(); diff --git a/src/tools/codeeditor/codeeditor.cpp b/src/tools/codeeditor/codeeditor.cpp index 4af1b18a5..e4522c282 100644 --- a/src/tools/codeeditor/codeeditor.cpp +++ b/src/tools/codeeditor/codeeditor.cpp @@ -248,8 +248,7 @@ void App::loadConfig() { mRecentFiles = String::split( recent, ';' ); mInitColorScheme = mConfig.editor.colorScheme = mIni.getValue( "editor", "colorscheme", "lite" ); - mConfig.editor.fontSize = - mIni.getValue( "editor", "font_size", mDisplayDPI > 105 ? "11dp" : "14dp" ); + mConfig.editor.fontSize = mIni.getValue( "editor", "font_size", "11dp" ); mConfig.window.size.setWidth( mIniState.getValueI( "window", "width", mDisplayDPI > 105 ? 1920 : 1280 ) ); mConfig.window.size.setHeight( @@ -264,7 +263,7 @@ void App::loadConfig() { mConfig.editor.highlightCurrentLine = mIni.getValueB( "editor", "highlight_current_line", true ); mConfig.editor.horizontalScrollbar = mIni.getValueB( "editor", "horizontal_scrollbar", false ); - mConfig.ui.fontSize = mIni.getValue( "ui", "font_size", mDisplayDPI > 105 ? "11dp" : "14dp" ); + mConfig.ui.fontSize = mIni.getValue( "ui", "font_size", "11dp" ); mConfig.editor.trimTrailingWhitespaces = mIni.getValueB( "editor", "trim_trailing_whitespaces", false ); mConfig.editor.forceNewLineAtEndOfFile =