mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 01:29:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix check for availability of wxWidgets for Win64

Browse Source 
In premake we check for wxWidgets on Windows to see if we can build
Atlas, this check wasn't adopted when adding support for Win64.

Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2025-05-01 12:45:47 +02:00
parent fb56668dd9
commit b527e6b870
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/premake/premake5.lua
+10 -9
View File
@@ -36,15 +36,6 @@ if _ACTION == "gmake" then
os.exit(1)
end
-- On Windows check if wxWidgets is available, if not disable atlas and emit warning.
-- This is because there are currently not prebuilt binaries provided.
if not _OPTIONS["without-atlas"] and os.istarget("windows") then
if not os.isfile("../../libraries/win32/wxwidgets/include/wx/wx.h") then
print("wxWidgets not found, disableing atlas")
_OPTIONS["without-atlas"] = ""
end
end
-- Root directory of project checkout relative to this .lua file
rootdir = "../.."
@@ -119,6 +110,16 @@ else
end
end
-- On Windows check if wxWidgets is available, if not disable atlas and emit warning.
-- This is because there are currently not prebuilt binaries provided.
if not _OPTIONS["without-atlas"] and os.istarget("windows") then
local win_libs_dir = rootdir .. "/libraries/" .. ( arch == "amd64" and "win64" or "win32" )
if not os.isfile( win_libs_dir .. "/wxwidgets/include/wx/wx.h") then
print("wxWidgets not found, disabling atlas")
_OPTIONS["without-atlas"] = ""
end
end
-- External libraries should know about arch.
dofile("extern_libs5.lua")