mirror of
https://github.com/GTAmodding/re3.git
synced 2025-02-19 21:35:23 +00:00
Merge remote-tracking branch 'origin/miami' into lcs
# Conflicts: # README.md # premake5.lua # src/render/Particle.cpp
This commit is contained in:
commit
d4ba7c387b
8 changed files with 16123 additions and 31 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -355,6 +355,7 @@ vendor/glfw-3.3.2.bin.WIN64/
|
|||
|
||||
sdk/
|
||||
|
||||
codewarrior/reVC.mcp
|
||||
codewarrior/reVC_Data/
|
||||
codewarrior/Release/
|
||||
codewarrior/Debug/
|
||||
|
|
Binary file not shown.
16066
codewarrior/reVC.mcp.xml
Normal file
16066
codewarrior/reVC.mcp.xml
Normal file
File diff suppressed because it is too large
Load diff
23
premake5.lua
23
premake5.lua
|
@ -27,6 +27,11 @@ newoption {
|
|||
description = "Build with opus"
|
||||
}
|
||||
|
||||
newoption {
|
||||
trigger = "no-git-hash",
|
||||
description = "Don't print git commit hash into binary"
|
||||
}
|
||||
|
||||
newoption {
|
||||
trigger = "lto",
|
||||
description = "Use link time optimization"
|
||||
|
@ -262,7 +267,11 @@ project "reLCS"
|
|||
files { addSrcFiles("src/vehicles") }
|
||||
files { addSrcFiles("src/weapons") }
|
||||
files { addSrcFiles("src/extras") }
|
||||
files { "src/extras/GitSHA1.cpp" } -- this won't be in repo in first build
|
||||
if(not _OPTIONS["no-git-hash"]) then
|
||||
files { "src/extras/GitSHA1.cpp" } -- this won't be in repo in first build
|
||||
else
|
||||
removefiles { "src/extras/GitSHA1.cpp" } -- but it will be everytime after
|
||||
end
|
||||
|
||||
includedirs { "src" }
|
||||
includedirs { "src/animation" }
|
||||
|
@ -290,6 +299,10 @@ project "reLCS"
|
|||
includedirs { "src/weapons" }
|
||||
includedirs { "src/extras" }
|
||||
|
||||
if(not _OPTIONS["no-git-hash"]) then
|
||||
defines { "USE_OUR_VERSIONING" }
|
||||
end
|
||||
|
||||
if _OPTIONS["with-opus"] then
|
||||
includedirs { "vendor/ogg/include" }
|
||||
includedirs { "vendor/opus/include" }
|
||||
|
@ -329,10 +342,14 @@ project "reLCS"
|
|||
-- external librw is dynamic
|
||||
staticruntime "on"
|
||||
end
|
||||
prebuildcommands { '"%{prj.location}..\\printHash.bat" "%{prj.location}..\\src\\extras\\GitSHA1.cpp"' }
|
||||
if(not _OPTIONS["no-git-hash"]) then
|
||||
prebuildcommands { '"%{prj.location}..\\printHash.bat" "%{prj.location}..\\src\\extras\\GitSHA1.cpp"' }
|
||||
end
|
||||
|
||||
filter "platforms:not win*"
|
||||
prebuildcommands { '"%{prj.location}/../printHash.sh" "%{prj.location}/../src/extras/GitSHA1.cpp"' }
|
||||
if(not _OPTIONS["no-git-hash"]) then
|
||||
prebuildcommands { '"%{prj.location}/../printHash.sh" "%{prj.location}/../src/extras/GitSHA1.cpp"' }
|
||||
end
|
||||
|
||||
filter "platforms:win*glfw*"
|
||||
staticruntime "off"
|
||||
|
|
|
@ -50,6 +50,7 @@ if(LIBRW_PLATFORM_D3D9)
|
|||
endif()
|
||||
|
||||
target_compile_definitions(${EXECUTABLE} PRIVATE CMAKE_BUILD)
|
||||
target_compile_definitions(${EXECUTABLE} PRIVATE USE_OUR_VERSIONING)
|
||||
|
||||
if(${PROJECT}_AUDIO STREQUAL "OAL")
|
||||
find_package(OpenAL REQUIRED)
|
||||
|
|
|
@ -2919,9 +2919,15 @@ CMenuManager::InitialiseChangedLanguageSettings()
|
|||
{
|
||||
if (m_bFrontEnd_ReloadObrTxtGxt) {
|
||||
m_bFrontEnd_ReloadObrTxtGxt = false;
|
||||
#ifdef FIX_BUGS
|
||||
if (gGameState > GS_INIT_ONCE)
|
||||
#endif
|
||||
CTimer::Stop();
|
||||
TheText.Unload();
|
||||
TheText.Load();
|
||||
#ifdef FIX_BUGS
|
||||
if (gGameState > GS_INIT_ONCE)
|
||||
#endif
|
||||
CTimer::Update();
|
||||
CGame::frenchGame = false;
|
||||
CGame::germanGame = false;
|
||||
|
|
|
@ -195,7 +195,8 @@ enum Config {
|
|||
#define DRAW_GAME_VERSION_TEXT
|
||||
#ifdef DRAW_GAME_VERSION_TEXT
|
||||
// unlike R* development builds, ours has runtime switch on debug menu & .ini, and disabled as default.
|
||||
#define USE_OUR_VERSIONING // If you disable this then game will fetch version from peds.col, as R* did while in development
|
||||
// If you disable this then game will fetch version from peds.col, as R* did while in development.
|
||||
//#define USE_OUR_VERSIONING // enabled from buildfiles by default
|
||||
#endif
|
||||
|
||||
// Memory allocation and compression
|
||||
|
|
|
@ -387,7 +387,7 @@ DoRWStuffEndOfFrame(void)
|
|||
}
|
||||
#else
|
||||
if (CPad::GetPad(1)->GetLeftShockJustDown() || CPad::GetPad(0)->GetFJustDown(11)) {
|
||||
sprintf(s, "screen_%11lld.png", time(nil));
|
||||
sprintf(s, "screen_0%11lld.png", time(nil));
|
||||
RwGrabScreen(Scene.camera, s);
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Add table
Reference in a new issue