diff options
| m--------- | librw | 0 | ||||
| -rw-r--r-- | premake5.lua | 92 | ||||
| -rw-r--r-- | src/render/Lines.cpp | 2 | ||||
| -rw-r--r-- | src/skel/win/win.cpp | 2 |
4 files changed, 2 insertions, 94 deletions
diff --git a/librw b/librw -Subproject 40eae78e793f234e332aff08265c41683faeb7f +Subproject bdbc92d86eef28344e01c992d55a9c4f43629f8 diff --git a/premake5.lua b/premake5.lua index f8e3af81..fbd2e011 100644 --- a/premake5.lua +++ b/premake5.lua @@ -198,95 +198,3 @@ project "re3" libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") } libdirs { path.join(_OPTIONS["glfwdir"], "lib-" .. string.gsub(_ACTION, "vs", "vc")) } links { "opengl32", "glew32s", "glfw3" } - - -project "reVC" - kind "WindowedApp" - targetname "reVC" - targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}" - targetextension ".exe" - characterset ("MBCS") - linkoptions "/SAFESEH:NO" - - defines { "MIAMI" } - - files { "src/*.*" } - files { "src/animation/*.*" } - files { "src/audio/*.*" } - files { "src/control/*.*" } - files { "src/core/*.*" } - files { "src/entities/*.*" } - files { "src/math/*.*" } - files { "src/modelinfo/*.*" } - files { "src/objects/*.*" } - files { "src/peds/*.*" } - files { "src/render/*.*" } - files { "src/rw/*.*" } - files { "src/save/*.*" } - files { "src/skel/*.*" } - files { "src/skel/win/*.*" } - files { "src/skel/glfw/*.*" } - files { "src/text/*.*" } - files { "src/vehicles/*.*" } - files { "src/weapons/*.*" } - files { "src/extras/*.*" } - files { "eax/*.*" } - - includedirs { "src" } - includedirs { "src/animation" } - includedirs { "src/audio" } - includedirs { "src/control" } - includedirs { "src/core" } - includedirs { "src/entities" } - includedirs { "src/math" } - includedirs { "src/modelinfo" } - includedirs { "src/objects" } - includedirs { "src/peds" } - includedirs { "src/render" } - includedirs { "src/rw" } - includedirs { "src/save/" } - includedirs { "src/skel/" } - includedirs { "src/skel/win" } - includedirs { "src/skel/glfw" } - includedirs { "src/text" } - includedirs { "src/vehicles" } - includedirs { "src/weapons" } - includedirs { "src/extras" } - includedirs { "eax" } - - includedirs { "milessdk/include" } - includedirs { "eax" } - - libdirs { "milessdk/lib" } - - setpaths("$(GTA_VC_RE_DIR)/", "$(TargetFileName)", "") - - filter "platforms:*RW33*" - staticruntime "on" - includedirs { "rwsdk/include/d3d8" } - libdirs { "rwsdk/lib/d3d8/release" } - links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" } - defines { "RWLIBS" } - linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text" - - filter "platforms:*librw*" - defines { "LIBRW" } - files { "src/fakerw/*.*" } - includedirs { "src/fakerw" } - includedirs { Librw } - if(_OPTIONS["with-librw"]) then - libdirs { "lib/%{cfg.platform}/%{cfg.buildcfg}" } - end - links { "rw" } - - filter "platforms:*d3d*" - includedirs { "dxsdk/include" } - libdirs { "dxsdk/lib" } - - filter "platforms:*d3d9*" - links { "d3d9" } - - filter "platforms:*gl3_glfw*" - libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") } - libdirs { path.join(_OPTIONS["glfwdir"], "lib-" .. string.gsub(_ACTION, "vs", "vc")) } - links { "opengl32", "glew32s", "glfw3" } diff --git a/src/render/Lines.cpp b/src/render/Lines.cpp index 84d3683b..b5c85149 100644 --- a/src/render/Lines.cpp +++ b/src/render/Lines.cpp @@ -60,8 +60,6 @@ CLines::RenderLineWithClipping(float x1, float y1, float z1, float x2, float y2, col2.green = c2>>16; col2.blue = c2>>8; col2.alpha = c2; -// HACK HACK until i got im3d fixed -RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil); RwIm3DVertexSetRGBA(&v[0], col1.red, col1.green, col1.blue, col1.alpha); RwIm3DVertexSetRGBA(&v[1], col2.red, col2.green, col2.blue, col2.alpha); diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp index ec72bf7e..d20cc0bf 100644 --- a/src/skel/win/win.cpp +++ b/src/skel/win/win.cpp @@ -1884,11 +1884,13 @@ WinMain(HINSTANCE instance, StaticPatcher::Apply(); SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, nil, SPIF_SENDCHANGE); +/* // TODO: make this an option somewhere AllocConsole(); freopen("CONIN$", "r", stdin); freopen("CONOUT$", "w", stdout); freopen("CONOUT$", "w", stderr); +*/ /* * Initialize the platform independent data. |