Skip to content

Commit

Permalink
[37_3] Rename windows_icon to research_windows_icon
Browse files Browse the repository at this point in the history
  • Loading branch information
da-liii authored Oct 18, 2023
1 parent 56e39a1 commit 453eef3
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 21 deletions.
29 changes: 15 additions & 14 deletions xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -437,20 +437,6 @@ target("libmogan") do
end)
end

if is_plat("mingw", "windows") then
target("windows_icon") do
set_version(XMACS_VERSION)
set_kind("object")
add_configfiles("packages/windows/resource.rc.in", {
filename = "resource.rc"
})
add_configfiles("packages/windows/TeXmacs.ico", {
onlycopy = true
})
add_files("$(buildir)/resource.rc")
end
end


includes("xmake/tm2html.lua")
if not is_plat("wasm") then
Expand Down Expand Up @@ -485,6 +471,21 @@ if is_plat("wasm", "linux") then
end
end


if is_plat("mingw", "windows") then
target("research_windows_icon") do
set_version(XMACS_VERSION)
set_kind("object")
add_configfiles("$(projectdir)/packages/windows/resource.rc.in", {
filename = "resource.rc"
})
add_configfiles("$(projectdir)/packages/windows/TeXmacs.ico", {
onlycopy = true
})
add_files("$(buildir)/resource.rc")
end
end

includes("xmake/research.lua")
target("research") do
set_version(XMACS_VERSION, {build = "%Y-%m-%d"})
Expand Down
5 changes: 2 additions & 3 deletions xmake/research.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ local TeXmacs_files = {
"TeXmacs(/plugins/**)" -- plugin files
}


function add_target_research_on_wasm()
set_languages("c++17")

Expand Down Expand Up @@ -124,8 +123,8 @@ function add_target_research_on_others()
add_syslinks("pthread")
end

if is_plat("mingw") and is_mode("release") then
add_deps("windows_icon")
if is_plat("mingw", "windows") and is_mode("release") then
add_deps("research_windows_icon")
end

set_configvar("PACKAGE", "Mogan Research")
Expand Down
4 changes: 0 additions & 4 deletions xmake/tm2html.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ function add_target_tm2html()
add_syslinks("pthread")
end

if is_plat("mingw") and is_mode("release") then
add_deps("windows_icon")
end

before_build(function (target)
target:add("forceincludes", path.absolute("$(buildir)/config.h"))
target:add("forceincludes", path.absolute("$(buildir)/tm_configure.hpp"))
Expand Down

0 comments on commit 453eef3

Please sign in to comment.