joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Vanilla config for Windows and win-x86 only

This commit is contained in:
withmorten 2021-07-12 04:13:42 +02:00
parent ac3905123e
commit f50026828a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
premake5.lua
View File

@ -68,7 +68,7 @@ end
workspace "re3" workspace "re3"
language "C++" language "C++"
configurations { "Debug", "Release", "Vanilla" } configurations { "Debug", "Release" }
startproject "re3" startproject "re3"
location "build" location "build"
symbols "Full" symbols "Full"
@ -80,6 +80,7 @@ workspace "re3"
end end
filter { "system:windows" } filter { "system:windows" }
configurations { "Vanilla" }
platforms { platforms {
"win-x86-RW33_d3d8-mss", "win-x86-RW33_d3d8-mss",
"win-x86-librw_d3d9-mss", "win-x86-librw_d3d9-mss",
@ -123,9 +124,6 @@ workspace "re3"
flags { "LinkTimeOptimization" } flags { "LinkTimeOptimization" }
end end
filter "configurations:Vanilla"
defines { "VANILLA_DEFINES" }
filter { "platforms:win*" } filter { "platforms:win*" }
system "windows" system "windows"
@ -305,6 +303,9 @@ project "re3"
includedirs { "src/weapons" } includedirs { "src/weapons" }
includedirs { "src/extras" } includedirs { "src/extras" }
filter "configurations:Vanilla"
defines { "VANILLA_DEFINES" }
if(not _OPTIONS["no-git-hash"]) then if(not _OPTIONS["no-git-hash"]) then
defines { "USE_OUR_VERSIONING" } defines { "USE_OUR_VERSIONING" }
end end

4
src/core/config.h
View File

@ -195,6 +195,10 @@ enum Config {
#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
#ifdef VANILLA_DEFINES #ifdef VANILLA_DEFINES
#if !defined(_WIN32) || defined(__LP64__) || defined(_WIN64)
#error Vanilla can only be built for win-x86
#endif
#define FINAL #define FINAL
#define MASTER #define MASTER
//#define USE_MY_DOCUMENTS //#define USE_MY_DOCUMENTS