Merge pull request #404 from Sergeanur/rwlink

Link with RW libs
GTAmodding · Apr 11, 2020 · 766a881a7e69836c865c98f137ccfae8b10a5276 · 766a881
2 parents c307e72 + daceee5
commit 766a881a7e69836c865c98f137ccfae8b10a5276
diff --git a/premake5.lua b/premake5.lua
@@ -1,5 +1,5 @@
 workspace "re3"
-	configurations { "Debug", "Release", "ReleaseFH" }
+	configurations { "Debug", "Release", "ReleaseFH", "DebugRW", "ReleaseRW"  }
 	location "build"
 
 	files { "src/*.*" }
@@ -13,6 +13,7 @@ workspace "re3"
 	files { "src/objects/*.*" }
 	files { "src/peds/*.*" }
 	files { "src/render/*.*" }
+	files { "src/rw/*.*" }
 	files { "src/save/*.*" }
 	files { "src/skel/*.*" }
 	files { "src/skel/win/*.*" }
@@ -32,6 +33,7 @@ workspace "re3"
 	includedirs { "src/objects" }
 	includedirs { "src/peds" }
 	includedirs { "src/render" }
+	includedirs { "src/rw" }
 	includedirs { "src/save/" }
 	includedirs { "src/skel/" }
 	includedirs { "src/skel/win" }
@@ -47,6 +49,12 @@ workspace "re3"
 
 	libdirs { "dxsdk/lib" }
 	libdirs { "milessdk/lib" }
+
+	filter "configurations:DebugRW or configurations:ReleaseRW"
+	defines { "RWLIBS" }
+	libdirs { "rwsdk/lib/d3d8/release" }
+	links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp" }
+	filter  {}
 
     pbcommands = { 
        "setlocal EnableDelayedExpansion",
@@ -102,3 +110,15 @@ project "re3"
 		staticruntime "on"
 		targetextension ".asi"
 		setpaths("$(GTA_III_RE_DIR)/", "gta3.exe", "scripts/")
+
+	filter "configurations:DebugRW"
+		defines { "DEBUG" }
+		staticruntime "on"
+		symbols "On"
+		setpaths("$(GTA_III_RE_DIR)/", "gta3.exe", "plugins/")
+
+	filter "configurations:ReleaseRW"
+		defines { "NDEBUG" }
+		optimize "On"
+		staticruntime "on"
+		setpaths("$(GTA_III_RE_DIR)/", "gta3.exe", "plugins/")
diff --git a/src/core/common.h b/src/core/common.h
@@ -74,9 +74,11 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
 }
 
 
+#ifndef RWLIBS
 // little hack
 extern void **rwengine;
 #define RwEngineInstance (*rwengine)
+#endif
 
 #include "skeleton.h"
 #include "Draw.h"

diff --git a/src/core/re3.cpp b/src/core/re3.cpp
@@ -24,7 +24,11 @@
 
 #include <list>
 
+#ifndef RWLIBS
 void **rwengine = *(void***)0x5A10E1;
+#else
+extern "C" int vsprintf(char* const _Buffer, char const* const _Format, va_list  _ArgList);
+#endif
 
 DebugMenuAPI gDebugMenuAPI;
 

diff --git a/src/core/RwClumpRead.cpp → src/rw/ClumpRead.cpp b/src/core/RwClumpRead.cpp → src/rw/ClumpRead.cpp
diff --git a/src/render/Lights.cpp → src/rw/Lights.cpp b/src/render/Lights.cpp → src/rw/Lights.cpp
diff --git a/src/render/Lights.h → src/rw/Lights.h b/src/render/Lights.h → src/rw/Lights.h
diff --git a/src/core/NodeName.cpp → src/rw/NodeName.cpp b/src/core/NodeName.cpp → src/rw/NodeName.cpp
diff --git a/src/core/NodeName.h → src/rw/NodeName.h b/src/core/NodeName.h → src/rw/NodeName.h
diff --git a/src/core/RwHelper.cpp → src/rw/RwHelper.cpp b/src/core/RwHelper.cpp → src/rw/RwHelper.cpp
diff --git a/src/core/RwHelper.h → src/rw/RwHelper.h b/src/core/RwHelper.h → src/rw/RwHelper.h
diff --git a/src/core/RwMatFX.cpp → src/rw/RwMatFX.cpp b/src/core/RwMatFX.cpp → src/rw/RwMatFX.cpp
diff --git a/src/core/RwTexRead.cpp → src/rw/TexRead.cpp b/src/core/RwTexRead.cpp → src/rw/TexRead.cpp
@@ -147,7 +147,11 @@ RwTexDictionaryGtaStreamRead2(RwStream *stream, RwTexDictionary *texDict)
 }
 
 #ifdef GTA_PC
+#ifdef RWLIBS
+extern "C" RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags);
+#else
 WRAPPER RwInt32 _rwD3D8FindCorrectRasterFormat(RwRasterType type, RwInt32 flags) { EAXJMP(0x59A350); }
+#endif
 
 void
 ReadVideoCardCapsFile(uint32 &cap32, uint32 &cap24, uint32 &cap16, uint32 &cap8)

diff --git a/src/core/TxdStore.cpp → src/rw/TxdStore.cpp b/src/core/TxdStore.cpp → src/rw/TxdStore.cpp
diff --git a/src/core/TxdStore.h → src/rw/TxdStore.h b/src/core/TxdStore.h → src/rw/TxdStore.h
diff --git a/src/render/VisibilityPlugins.cpp → src/rw/VisibilityPlugins.cpp b/src/render/VisibilityPlugins.cpp → src/rw/VisibilityPlugins.cpp
diff --git a/src/render/VisibilityPlugins.h → src/rw/VisibilityPlugins.h b/src/render/VisibilityPlugins.h → src/rw/VisibilityPlugins.h
diff --git a/src/core/rw.cpp → src/rw/rw.cpp b/src/core/rw.cpp → src/rw/rw.cpp