mirror of
https://github.com/Detanup01/gbe_fork.git
synced 2024-10-23 04:58:16 +08:00
fix linux clang
added emubuild param
This commit is contained in:
parent
a8abf72fef
commit
7a3b7832b3
@ -9,7 +9,7 @@ chmod +777 premake5 # do we really need this?
|
|||||||
./premake5 --os=linux generateproto
|
./premake5 --os=linux generateproto
|
||||||
|
|
||||||
# target other than clang?
|
# target other than clang?
|
||||||
./premake5 --os=linux --cc:clang gmake
|
./premake5 --os=linux --cc=clang gmake
|
||||||
|
|
||||||
# going into build dir
|
# going into build dir
|
||||||
cd GBE_Build
|
cd GBE_Build
|
||||||
|
@ -23,7 +23,8 @@ if "%my_vs_path%"=="" (
|
|||||||
:: Set configuration and platform here :)
|
:: Set configuration and platform here :)
|
||||||
|
|
||||||
:: -v:n make it so we can actually see what commands it runs
|
:: -v:n make it so we can actually see what commands it runs
|
||||||
call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=Release /p:Platform=x64 -v:n
|
call %my_vs_path% GBE_Build\GBE.sln /p:Configuration=ExperimentalDebug /p:Platform=x64 -v:n
|
||||||
|
::call %my_vs_path% GBE_Build\GBE.sln
|
||||||
set /a _exit=%errorlevel%
|
set /a _exit=%errorlevel%
|
||||||
if %_exit% equ 0 (
|
if %_exit% equ 0 (
|
||||||
echo Please do change_dos_stub and sign it. (or you can move into premake to do it for you)
|
echo Please do change_dos_stub and sign it. (or you can move into premake to do it for you)
|
||||||
|
25
premake5.lua
25
premake5.lua
@ -80,8 +80,7 @@ local linux_files = {
|
|||||||
default_files,
|
default_files,
|
||||||
predefined_libs,
|
predefined_libs,
|
||||||
crash_linux,
|
crash_linux,
|
||||||
"controller/**",
|
"controller/**"
|
||||||
""
|
|
||||||
}
|
}
|
||||||
-- 32
|
-- 32
|
||||||
local x32_libsdir_win = {
|
local x32_libsdir_win = {
|
||||||
@ -193,6 +192,12 @@ if _ACTION == "generateproto" then
|
|||||||
print("Generation success!")
|
print("Generation success!")
|
||||||
end
|
end
|
||||||
|
|
||||||
|
newoption {
|
||||||
|
trigger = "emubuild",
|
||||||
|
description = "Set the EMU_BUILD_STRING",
|
||||||
|
default = "manual"
|
||||||
|
}
|
||||||
|
|
||||||
workspace "GBE"
|
workspace "GBE"
|
||||||
configurations { "Debug", "Release", "ExperimentalDebug", "ExperimentalRelease" }
|
configurations { "Debug", "Release", "ExperimentalDebug", "ExperimentalRelease" }
|
||||||
platforms { "x64", "x32" }
|
platforms { "x64", "x32" }
|
||||||
@ -229,10 +234,10 @@ project "SteamEmu"
|
|||||||
}
|
}
|
||||||
|
|
||||||
filter { "options:os=windows", "configurations:Release" }
|
filter { "options:os=windows", "configurations:Release" }
|
||||||
defines {"NDEBUG", "EMU_RELEASE_BUILD", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS" }
|
defines {"NDEBUG", "EMU_RELEASE_BUILD", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
|
|
||||||
filter { "options:os=windows", "configurations:Debug" }
|
filter { "options:os=windows", "configurations:Debug" }
|
||||||
defines {"DEBUG", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS" }
|
defines {"DEBUG", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
|
|
||||||
-- WIN 32 DEFAULTS
|
-- WIN 32 DEFAULTS
|
||||||
filter { "platforms:x32", "options:os=windows" }
|
filter { "platforms:x32", "options:os=windows" }
|
||||||
@ -302,10 +307,10 @@ project "SteamEmu"
|
|||||||
}
|
}
|
||||||
|
|
||||||
filter { "options:os=linux", "configurations:Release" }
|
filter { "options:os=linux", "configurations:Release" }
|
||||||
defines {"NDEBUG", "EMU_RELEASE_BUILD", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC", "CONTROLLER_SUPPORT" }
|
defines {"NDEBUG", "EMU_RELEASE_BUILD", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC", "CONTROLLER_SUPPORT", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
|
|
||||||
filter { "options:os=linux", "configurations:Debug" }
|
filter { "options:os=linux", "configurations:Debug" }
|
||||||
defines {"DEBUG", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC", "CONTROLLER_SUPPORT" }
|
defines {"DEBUG", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC", "CONTROLLER_SUPPORT", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
|
|
||||||
-- linux 32 DEFAULTS
|
-- linux 32 DEFAULTS
|
||||||
filter { "platforms:x32", "options:os=linux" }
|
filter { "platforms:x32", "options:os=linux" }
|
||||||
@ -341,7 +346,7 @@ project "SteamEmu"
|
|||||||
"resources/win/api/32/resources.rc"
|
"resources/win/api/32/resources.rc"
|
||||||
}
|
}
|
||||||
removefiles { "libs/detours/uimports.cc" }
|
removefiles { "libs/detours/uimports.cc" }
|
||||||
defines { "DEBUG", "EMU_EXPERIMENTAL_BUILD", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS" }
|
defines { "DEBUG", "EMU_EXPERIMENTAL_BUILD", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
-- ExperimentalRelease WINDOWS
|
-- ExperimentalRelease WINDOWS
|
||||||
filter { "ExperimentalRelease", "options:os=windows" }
|
filter { "ExperimentalRelease", "options:os=windows" }
|
||||||
files {
|
files {
|
||||||
@ -353,7 +358,7 @@ project "SteamEmu"
|
|||||||
"resources/win/api/32/resources.rc"
|
"resources/win/api/32/resources.rc"
|
||||||
}
|
}
|
||||||
removefiles { "libs/detours/uimports.cc" }
|
removefiles { "libs/detours/uimports.cc" }
|
||||||
defines { "NDEBUG", "EMU_RELEASE_BUILD", "EMU_EXPERIMENTAL_BUILD" ,"CONTROLLER_SUPPORT", "EMU_OVERLAY", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS" }
|
defines { "NDEBUG", "EMU_RELEASE_BUILD", "EMU_EXPERIMENTAL_BUILD" , "CONTROLLER_SUPPORT", "EMU_OVERLAY", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "_CRT_SECURE_NO_WARNINGS", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
-- ExperimentalDebug LINUX
|
-- ExperimentalDebug LINUX
|
||||||
filter { "ExperimentalDebug", "options:os=linux" }
|
filter { "ExperimentalDebug", "options:os=linux" }
|
||||||
files {
|
files {
|
||||||
@ -363,7 +368,7 @@ project "SteamEmu"
|
|||||||
"controller/**",
|
"controller/**",
|
||||||
"overlay_experimental/**"
|
"overlay_experimental/**"
|
||||||
}
|
}
|
||||||
defines { "DEBUG", "CONTROLLER_SUPPORT", "EMU_OVERLAY", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC" }
|
defines { "DEBUG", "CONTROLLER_SUPPORT", "EMU_OVERLAY", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
-- ExperimentalRelease LINUX
|
-- ExperimentalRelease LINUX
|
||||||
filter { "ExperimentalRelease", "options:os=linux" }
|
filter { "ExperimentalRelease", "options:os=linux" }
|
||||||
files {
|
files {
|
||||||
@ -373,7 +378,7 @@ project "SteamEmu"
|
|||||||
"controller/**",
|
"controller/**",
|
||||||
"overlay_experimental/**"
|
"overlay_experimental/**"
|
||||||
}
|
}
|
||||||
defines { "NDEBUG", "EMU_RELEASE_BUILD", "CONTROLLER_SUPPORT", "EMU_OVERLAY", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC" }
|
defines { "NDEBUG", "EMU_RELEASE_BUILD", "CONTROLLER_SUPPORT", "EMU_OVERLAY", "ImTextureID=ImU64", "UTF_CPP_CPLUSPLUS=201703L", "CURL_STATICLIB", "UNICODE", "_UNICODE", "GNUC", "EMU_BUILD_STRING=".._OPTIONS["emubuild"] }
|
||||||
|
|
||||||
-- End SteamEmu
|
-- End SteamEmu
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user