summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-16 22:09:34 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-16 22:09:34 +0200
commit5c8888d2edb4f77a30ca52c5a48669d937ae9ef2 (patch)
tree62c1274fc38820d2f2037ae6dab48576439b1ed2
parentmore script stuff (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-5c8888d2edb4f77a30ca52c5a48669d937ae9ef2.tar
re3-5c8888d2edb4f77a30ca52c5a48669d937ae9ef2.tar.gz
re3-5c8888d2edb4f77a30ca52c5a48669d937ae9ef2.tar.bz2
re3-5c8888d2edb4f77a30ca52c5a48669d937ae9ef2.tar.lz
re3-5c8888d2edb4f77a30ca52c5a48669d937ae9ef2.tar.xz
re3-5c8888d2edb4f77a30ca52c5a48669d937ae9ef2.tar.zst
re3-5c8888d2edb4f77a30ca52c5a48669d937ae9ef2.zip
-rw-r--r--premake5.lua36
-rw-r--r--src/audio/AudioManager.cpp4
-rw-r--r--src/fakerw/fake.cpp2
-rw-r--r--src/rw/RwHelper.cpp11
4 files changed, 41 insertions, 12 deletions
diff --git a/premake5.lua b/premake5.lua
index 44b8b576..0f3a03dc 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -23,6 +23,22 @@ else
Librw = os.getenv("LIBRW") or "librw"
end
+function getsys(a)
+ if a == 'windows' then
+ return 'win'
+ end
+ return a
+end
+
+function getarch(a)
+ if a == 'x86_64' then
+ return 'amd64'
+ elseif a == 'ARM' then
+ return 'arm'
+ end
+ return a
+end
+
workspace "reVC"
language "C++"
configurations { "Debug", "Release" }
@@ -40,6 +56,8 @@ workspace "reVC"
filter { "system:linux" }
platforms {
"linux-x86-librw_gl3_glfw-oal",
+ "linux-amd64-librw_gl3_glfw-oal",
+ "linux-arm-librw_gl3_glfw-oal",
}
filter "configurations:Debug"
@@ -58,6 +76,12 @@ workspace "reVC"
filter { "platforms:*x86*" }
architecture "x86"
+ filter { "platforms:*amd64*" }
+ architecture "amd64"
+
+ filter { "platforms:*arm*" }
+ architecture "ARM"
+
filter { "platforms:*librw_d3d9*" }
defines { "RW_D3D9" }
if(not _OPTIONS["with-librw"]) then
@@ -68,17 +92,12 @@ workspace "reVC"
defines { "RW_GL3" }
includedirs { path.join(_OPTIONS["glfwdir"], "include") }
includedirs { path.join(_OPTIONS["glewdir"], "include") }
-
- filter "platforms:win*librw_gl3_glfw*"
- defines { "GLEW_STATIC" }
if(not _OPTIONS["with-librw"]) then
- libdirs { path.join(Librw, "lib/win-x86-gl3/%{cfg.buildcfg}") }
+ libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
end
- filter "platforms:linux*librw_gl3_glfw*"
- if(not _OPTIONS["with-librw"]) then
- libdirs { path.join(Librw, "lib/linux-x86-gl3/%{cfg.buildcfg}") }
- end
+ filter "platforms:win*librw_gl3_glfw*"
+ defines { "GLEW_STATIC" }
filter {}
@@ -182,7 +201,6 @@ project "reVC"
targetextension ".exe"
filter "platforms:linux*"
- targetextension ".elf"
defines { "OPENAL" }
links { "openal", "mpg123", "sndfile", "pthread" }
diff --git a/src/audio/AudioManager.cpp b/src/audio/AudioManager.cpp
index 207d64ad..c30306c8 100644
--- a/src/audio/AudioManager.cpp
+++ b/src/audio/AudioManager.cpp
@@ -7459,7 +7459,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
return;
}
if (processedAccelSampleStopped) {
- if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + 345, 0))
+ if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + SFX_CAR_ACCEL_1, 0))
return;
SampleManager.SetChannelLoopCount(m_nActiveSamples, 1);
SampleManager.SetChannelLoopPoints(m_nActiveSamples, 0, -1);
@@ -7482,7 +7482,7 @@ cAudioManager::ProcessPlayersVehicleEngine(cVehicleParams *params, CAutomobile *
}
if (CurrentPretendGear < params->m_pTransmission->nNumberOfGears - 1) {
++CurrentPretendGear;
- if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + 345, 0))
+ if (!SampleManager.InitialiseChannel(m_nActiveSamples, soundOffset + SFX_CAR_ACCEL_1, 0))
return;
SampleManager.SetChannelLoopCount(m_nActiveSamples, 1);
SampleManager.SetChannelLoopPoints(m_nActiveSamples, 0, -1);
diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index 50d12b2f..71646020 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -470,7 +470,7 @@ RwBool RwRenderStateSet(RwRenderState state, void *value)
uint32 uival = (uintptr)value;
uint32 fog;
switch(state){
- case rwRENDERSTATETEXTURERASTER: SetRenderState(TEXTURERASTER, uival); return true;
+ case rwRENDERSTATETEXTURERASTER: SetRenderStatePtr(TEXTURERASTER, value); return true;
case rwRENDERSTATETEXTUREADDRESS: SetRenderState(TEXTUREADDRESS, uival); return true;
case rwRENDERSTATETEXTUREADDRESSU: SetRenderState(TEXTUREADDRESSU, uival); return true;
case rwRENDERSTATETEXTUREADDRESSV: SetRenderState(TEXTUREADDRESSV, uival); return true;
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index 91916df3..a87874d7 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -60,6 +60,16 @@ void FlushObrsPrintfs()
void *
RwMallocAlign(RwUInt32 size, RwUInt32 align)
{
+#ifdef FIX_BUGS
+ uintptr ptralign = align-1;
+ void *mem = (void *)malloc(size + sizeof(uintptr) + ptralign);
+
+ ASSERT(mem != nil);
+
+ void *addr = (void *)((((uintptr)mem) + sizeof(uintptr) + ptralign) & ~ptralign);
+
+ ASSERT(addr != nil);
+#else
void *mem = (void *)malloc(size + align);
ASSERT(mem != nil);
@@ -67,6 +77,7 @@ RwMallocAlign(RwUInt32 size, RwUInt32 align)
void *addr = (void *)((((uintptr)mem) + align) & ~(align - 1));
ASSERT(addr != nil);
+#endif
*(((void **)addr) - 1) = mem;