Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-23 19:25:35 +08:00
Code Issues 1 Projects Releases Wiki Activity

fix overlay compilation on MinGW, now everything compiles everywhere!

Browse Source
This commit is contained in:
otavepto 2024-05-28 04:08:04 +03:00
parent ff8358cfb4
commit 1932c06fe5
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
premake5-deps.lua
View File

@ -618,30 +618,37 @@ if _OPTIONS["build-ingame_overlay"] or _OPTIONS["all-build"] then
'INGAMEOVERLAY_BUILD_TESTS=OFF', 'INGAMEOVERLAY_BUILD_TESTS=OFF',
} }
-- fix missing standard include/header file for gcc/clang -- fix missing standard include/header file for gcc/clang
local ingame_overlay_missing_inc = {} local ingame_overlay_fixes = {}
if string.match(_ACTION, 'gmake.*') then if string.match(_ACTION, 'gmake.*') then
ingame_overlay_missing_inc = { ingame_overlay_fixes = {
'-include cstdint', '-include cstdint',
'-include cinttypes', '-include cinttypes',
} }
-- MinGW fixes
if os.target() == 'windows' then
-- MinGW throws this error: Library.cpp:77:26: error: invalid conversion from 'FARPROC' {aka 'long long int (*)()'} to 'void*' [-fpermissive]
table.insert(ingame_overlay_fixes, '-fpermissive')
-- MinGW throws this error: Filesystem.cpp:139:38: error: no matching function for call to 'stat::stat(const char*, stat*)
table.insert(ingame_overlay_fixes, '-include sys/stat.h')
end
end end
if _OPTIONS["32-build"] then if _OPTIONS["32-build"] then
cmake_build('ingame_overlay/deps/System', true, { cmake_build('ingame_overlay/deps/System', true, {
'BUILD_SYSTEMLIB_TESTS=OFF', 'BUILD_SYSTEMLIB_TESTS=OFF',
}, nil, ingame_overlay_missing_inc) }, nil, ingame_overlay_fixes)
cmake_build('ingame_overlay/deps/mini_detour', true, { cmake_build('ingame_overlay/deps/mini_detour', true, {
'BUILD_MINIDETOUR_TESTS=OFF', 'BUILD_MINIDETOUR_TESTS=OFF',
}) })
cmake_build('ingame_overlay', true, ingame_overlay_common_defs, nil, ingame_overlay_missing_inc) cmake_build('ingame_overlay', true, ingame_overlay_common_defs, nil, ingame_overlay_fixes)
end end
if _OPTIONS["64-build"] then if _OPTIONS["64-build"] then
cmake_build('ingame_overlay/deps/System', false, { cmake_build('ingame_overlay/deps/System', false, {
'BUILD_SYSTEMLIB_TESTS=OFF', 'BUILD_SYSTEMLIB_TESTS=OFF',
}, nil, ingame_overlay_missing_inc) }, nil, ingame_overlay_fixes)
cmake_build('ingame_overlay/deps/mini_detour', false, { cmake_build('ingame_overlay/deps/mini_detour', false, {
'BUILD_MINIDETOUR_TESTS=OFF', 'BUILD_MINIDETOUR_TESTS=OFF',
}) })
cmake_build('ingame_overlay', false, ingame_overlay_common_defs, nil, ingame_overlay_missing_inc) cmake_build('ingame_overlay', false, ingame_overlay_common_defs, nil, ingame_overlay_fixes)
end end
end end