Merge pull request #1 from GTAmodding/miami

Miami
GTAmodding · Jul 29, 2020 · 52e77c66345399f7f1064b80676a2495e299bb46 · 52e77c6
2 parents 1803dcc + c649028
commit 52e77c66345399f7f1064b80676a2495e299bb46
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -24,7 +24,7 @@ install:
 - cmd: >-
     git submodule update --init --recursive
 
-    premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%
+    premake5 vs2019 --with-librw --glewdir=%APPVEYOR_BUILD_FOLDER%/%GLEW_BASE% --glfwdir32=%APPVEYOR_BUILD_FOLDER%/%GLFW_BASE%
 
 build:
   project: build/reVC.sln

diff --git a/README.md b/README.md
@@ -21,17 +21,19 @@ such that we have a working game at all times.
 
 ## Preparing the environment for building
 
-Currently only building on VS2015/2017/2019 (Windows) and GCC (Linux) is tested.
-
 - Clone the repo.
 - Run `git submodule init` and `git submodule update`.
 - Point GTA_III_RE_DIR environment variable to GTA3 root folder.
 - Run premake
 	- On Windows: one of the `premake-vsXXXX.cmd` variants on root folder
 	- On Linux: proceed to [Building on Linux](https://github.com/GTAmodding/re3/wiki/Building-on-Linux).
 - There are various settings at the very bottom of [config.h](https://github.com/GTAmodding/re3/tree/master/src/core/config.h), you may want to take a look there. i.e. FIX_BUGS define fixes the bugs we've come across.
+- **If you use 64-bit D3D9**: We don't ship 64-bit Dx9 SDK. You need to download it from Microsoft if you don't have it(although it should come pre-installed after some Windows version)
+
+
+> :information_source: **If you choose OpenAL(OAL) on Windows** You must read [Running OAL build on Windows](https://github.com/GTAmodding/re3/wiki/Running-OAL-build-on-Windows).
 
-> :information_source: **Rendering engine** re3 uses completely homebrew RenderWare-replacement rendering engine; [librw](https://github.com/aap/librw/). librw comes as submodule of re3, but you also can use LIBRW enviorenment variable to specify path to your own librw.
+> :information_source: **Did you notice librw?** re3 uses completely homebrew RenderWare-replacement rendering engine; [librw](https://github.com/aap/librw/). librw comes as submodule of re3, but you also can use LIBRW enviorenment variable to specify path to your own librw.
 
 ## Contributing
 

diff --git a/librw b/librw
diff --git a/libsndfile/ChangeLog → libsndfile.32/ChangeLog b/libsndfile/ChangeLog → libsndfile.32/ChangeLog
diff --git a/libsndfile/NEWS → libsndfile.32/NEWS b/libsndfile/NEWS → libsndfile.32/NEWS
diff --git a/libsndfile/dist/libsndfile-1.dll → libsndfile.32/dist/libsndfile-1.dll b/libsndfile/dist/libsndfile-1.dll → libsndfile.32/dist/libsndfile-1.dll
diff --git a/libsndfile/include/sndfile.h → libsndfile.32/include/sndfile.h b/libsndfile/include/sndfile.h → libsndfile.32/include/sndfile.h
diff --git a/libsndfile/include/sndfile.hh → libsndfile.32/include/sndfile.hh b/libsndfile/include/sndfile.hh → libsndfile.32/include/sndfile.hh
diff --git a/libsndfile/lib/libsndfile-1.def → libsndfile.32/lib/libsndfile-1.def b/libsndfile/lib/libsndfile-1.def → libsndfile.32/lib/libsndfile-1.def
diff --git a/libsndfile/lib/libsndfile-1.lib → libsndfile.32/lib/libsndfile-1.lib b/libsndfile/lib/libsndfile-1.lib → libsndfile.32/lib/libsndfile-1.lib
diff --git a/libsndfile/lib/pkgconfig/sndfile.pc → libsndfile.32/lib/pkgconfig/sndfile.pc b/libsndfile/lib/pkgconfig/sndfile.pc → libsndfile.32/lib/pkgconfig/sndfile.pc
+2 −1		premake5.lua
+1 −1		src/base.cpp
+1 −11		src/bmp.cpp
+2 −1		src/charset.cpp
+14 −11		src/d3d/d3d.cpp
+2 −0		src/d3d/d3ddevice.cpp
+4 −3		src/d3d/rwd3d.h
+1 −1		src/d3d/rwxbox.h
+1 −0		src/engine.cpp
+9 −9		src/gl/gl3raster.cpp
+1 −1		src/gl/gl3shader.cpp
+1 −0		src/gl/rwgl3.h
+470 −10		src/image.cpp
+6,410 −0		src/lodepng/lodepng.cpp
+1,945 −0		src/lodepng/lodepng.h
+156 −0		src/png.cpp
+105 −92		src/ps2/ps2raster.cpp
+27 −3		src/ps2/rwps2.h
+63 −5		src/raster.cpp
+1 −1		src/rwbase.h
+11 −9		src/rwengine.h
+59 −6		src/rwobjects.h
+35 −5		src/texture.cpp
+23 −22		src/tga.cpp
+11 −4		tools/playground/main.cpp
+6 −6		tools/playground/ras_test.cpp
+520 −0		tools/playground/splines.cpp