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

ecode: mingw64 build improvements.

Browse Source
This commit is contained in:
Martín Lucas Golini
2022-06-13 23:28:00 -03:00
parent f9ff55e560
commit 4f9b9796d7
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/assets/icon/ee.x64.res Normal file
View File

Binary file not shown.

11
premake5.lua
View File

@@ -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 )

27
projects/mingw32/ecode/build.app.sh
View File

@@ -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}')