From 4f9b9796d754e1fc3d7b9bee9d658d3a0e20d3ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Mon, 13 Jun 2022 23:28:00 -0300 Subject: [PATCH] ecode: mingw64 build improvements. --- bin/assets/icon/ee.x64.res | Bin 0 -> 19316 bytes premake5.lua | 11 ++++++++--- projects/mingw32/ecode/build.app.sh | 27 +++++++++++++++++++-------- 3 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 bin/assets/icon/ee.x64.res diff --git a/bin/assets/icon/ee.x64.res b/bin/assets/icon/ee.x64.res new file mode 100644 index 0000000000000000000000000000000000000000..ccfe723cfa814ca78f45aa0447d9557d7c4ad86b GIT binary patch literal 19316 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 DgvFey literal 0 HcmV?d00001 diff --git a/premake5.lua b/premake5.lua index 486d26d7d..6724b4716 100644 --- a/premake5.lua +++ b/premake5.lua @@ -249,11 +249,16 @@ function build_link_configuration( package_name, use_ee_icon ) set_xcode_config() build_arch_configuration() - filter { "system:windows", "action:not vs*" } + filter { "system:windows", "action:not vs*", "architecture:x86" } if ( true == use_ee_icon ) then linkoptions { "../../bin/assets/icon/ee.res" } end + filter { "system:windows", "action:not vs*", "architecture:x86_64" } + if ( true == use_ee_icon ) then + linkoptions { "../../bin/assets/icon/ee.x64.res" } + end + filter { "system:windows", "action:vs*" } files { "bin/assets/icon/ee.rc", "bin/assets/icon/ee.ico" } vpaths { ['Resources/*'] = { "ee.rc", "ee.ico" } } @@ -294,10 +299,10 @@ function build_link_configuration( package_name, use_ee_icon ) syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/lib/x64" } filter { "options:windows-mingw-build", "architecture:x86", "options:cc=mingw" } - syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/i686-w64-mingw32/lib/" } + syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/i686-w64-mingw32/lib/", "/usr/i686-w64-mingw32/sys-root/mingw/lib/" } filter { "options:windows-mingw-build", "architecture:x86_64", "options:cc=mingw" } - syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/x86_64-w64-mingw32/lib/" } + syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/x86_64-w64-mingw32/lib/", "/usr/x86_64-w64-mingw32/sys-root/mingw/lib/" } filter "system:emscripten" targetname ( package_name .. extension ) diff --git a/projects/mingw32/ecode/build.app.sh b/projects/mingw32/ecode/build.app.sh index 31f0a5893..61a791341 100755 --- a/projects/mingw32/ecode/build.app.sh +++ b/projects/mingw32/ecode/build.app.sh @@ -3,12 +3,17 @@ CANONPATH=$(readlink -f "$0") DIRPATH="$(dirname "$CANONPATH")" cd "$DIRPATH" || exit -ARCH=x86 -ARCHI=i686 +ARCH=x86_64 +ARCHI=$ARCH +BUILDTYPE=release for i in "$@"; do case $i in - config=*) - ARCH="${i#*=}" + arch=*) + ARCH_CONFIG="${i#*=}" + shift + ;; + buildtype=*) + BUILDTYPE_CONFIG="${i#*=}" shift ;; *) @@ -16,12 +21,16 @@ for i in "$@"; do esac done -if [[ "$ARCH" == *"x86_64"* ]]; then - ARCH=x86_64 - ARCHI=$ARCH +if [[ "$BUILDTYPE_CONFIG" == "debug" ]]; then + BUILDTYPE=debug fi -../make.sh -e config=release_"$ARCH" -j"$(nproc)" ecode +if [[ "$ARCH_CONFIG" == "x86" ]]; then + ARCH=x86 + ARCHI=i686 +fi + +../make.sh -e config="$BUILDTYPE"_"$ARCH" -j"$(nproc)" ecode SDLVER=$(grep "remote_sdl2_version =" ../../../premake5.lua | awk '{print $3}' | tr -d '"') rm -rf ./ecode @@ -41,6 +50,8 @@ cp -r ../../../bin/assets/fonts/NotoColorEmoji.ttf ecode/assets/fonts/ cp -r ../../../bin/assets/plugins ecode/assets/ mkdir ecode/assets/ui cp ../../../bin/assets/ui/breeze.css ecode/assets/ui/ +mkdir -p ecode/assets/icon +cp ../../../bin/assets/icon/ee.png ecode/assets/icon/ VERSIONPATH=../../../src/tools/ecode/version.hpp ECODE_MAJOR_VERSION=$(grep "define ECODE_MAJOR_VERSION" $VERSIONPATH | awk '{print $3}')