Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-06-02 19:46:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

ecode: Added ecode windows exe icon.

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-03-20 18:19:38 -03:00
parent 4281c78f9c
commit 3aeb3fdc2f
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/assets/icon/ecode.res Normal file
View File

Binary file not shown.

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

Binary file not shown.

6
premake4.lua
View File

@@ -1379,8 +1379,10 @@ solution "eepp"
if os.is("haiku") then
links { "bsd" }
end
build_link_configuration( "ecode", true )
if os.is("windows") and not is_vs() then
linkoptions { "../../bin/assets/icon/ecode.res" }
end
build_link_configuration( "ecode", false )
project "eterm"
set_kind()

21
premake5.lua
View File

@@ -291,18 +291,20 @@ function build_link_configuration( package_name, use_ee_icon )
end
filter { "system:windows", "action:not vs*", "architecture:x86" }
if ( true == use_ee_icon ) then
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
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" } }
if true == use_ee_icon then
files { "bin/assets/icon/ee.rc", "bin/assets/icon/ee.ico" }
vpaths { ['Resources/*'] = { "ee.rc", "ee.ico" } }
end
filter "action:not vs*"
buildoptions { "-Wall" }
@@ -487,7 +489,7 @@ end
function set_ios_config()
if os.istarget("ios") then
local toolchainpath = os.getenv("TOOLCHAINPATH")
-- local toolchainpath = os.getenv("TOOLCHAINPATH")
local iosversion = os.getenv("IOSVERSION")
local sysroot_path = os.getenv("SYSROOTPATH")
@@ -1066,7 +1068,14 @@ workspace "eepp"
files { "src/tools/ecode/**.cpp" }
incdirs { "src/thirdparty/efsw/include", "src/thirdparty", "src/modules/eterm/include/" }
links { "efsw-static", "eterm-static" }
build_link_configuration( "ecode", true )
build_link_configuration( "ecode", false )
filter { "system:windows", "action:vs*" }
files { "bin/assets/icon/ecode.rc", "bin/assets/icon/ecode.ico" }
vpaths { ['Resources/*'] = { "ecode.rc", "ecode.ico" } }
filter { "system:windows", "action:not vs*", "architecture:x86" }
linkoptions { "../../bin/assets/icon/ecode.res" }
filter { "system:windows", "action:not vs*", "architecture:x86_64" }
linkoptions { "../../bin/assets/icon/ecode.x64.res" }
filter "options:with-debug-symbols"
defines { "ECODE_USE_BACKWARD" }
filter "system:macosx"