diff --git a/cnc-ddraw.sln b/cnc-ddraw.sln index 3ad25e5..d5267c8 100644 --- a/cnc-ddraw.sln +++ b/cnc-ddraw.sln @@ -1,18 +1,21 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2006 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30503.244 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cnc-ddraw", "cnc-ddraw.vcxproj", "{96094551-5D52-4EBD-BE4C-5291A03507FC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 + DebugLog|x86 = DebugLog|x86 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {96094551-5D52-4EBD-BE4C-5291A03507FC}.Debug|x86.ActiveCfg = Debug|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Debug|x86.Build.0 = Debug|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLog|x86.ActiveCfg = DebugLog|Win32 + {96094551-5D52-4EBD-BE4C-5291A03507FC}.DebugLog|x86.Build.0 = DebugLog|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Release|x86.ActiveCfg = Release|Win32 {96094551-5D52-4EBD-BE4C-5291A03507FC}.Release|x86.Build.0 = Release|Win32 EndGlobalSection diff --git a/cnc-ddraw.vcxproj b/cnc-ddraw.vcxproj index ebdd647..9db69b2 100644 --- a/cnc-ddraw.vcxproj +++ b/cnc-ddraw.vcxproj @@ -1,6 +1,10 @@  + + DebugLog + Win32 + Debug Win32 @@ -101,6 +105,13 @@ true MultiByte + + DynamicLibrary + false + v141_xp + true + MultiByte + @@ -112,6 +123,9 @@ + + + $(SolutionDir)bin\Debug\ @@ -125,6 +139,12 @@ false ddraw + + $(SolutionDir)bin\Release\ + $(SolutionDir)bin\Release\ + false + ddraw + @@ -168,6 +188,26 @@ if exist "$(LocalDebuggerCommand)" if exist "$(LocalDebuggerWorkingDirectory)" ddraw.def + + + Level3 + + + MaxSpeed + true + true + _DEBUG;_DEBUG_X;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + inc;src\detours + + + Windows + true + true + winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ddraw.def + + diff --git a/ddraw.def b/ddraw.def index c537348..8262efb 100644 --- a/ddraw.def +++ b/ddraw.def @@ -1,9 +1,9 @@ LIBRARY ddraw.dll EXPORTS - DirectDrawCreate @8 + DirectDrawCreate @8 DirectDrawCreateClipper @9 - DirectDrawEnumerateA @11 + DirectDrawEnumerateA @11 GameHandlesClose DATA NvOptimusEnablement DATA AmdPowerXpressRequestHighPerformance DATA diff --git a/inc/debug.h b/inc/debug.h index 1e9165c..de42ee0 100644 --- a/inc/debug.h +++ b/inc/debug.h @@ -24,7 +24,7 @@ extern DWORD g_dbg_frame_count; //#define _DEBUG 1 //use OutputDebugStringA rather than printf -#define _DEBUG_S 1 +//#define _DEBUG_S 1 //log everything (slow) //#define _DEBUG_X 1 diff --git a/inc/opengl_utils.h b/inc/opengl_utils.h index a8046f4..1447182 100644 --- a/inc/opengl_utils.h +++ b/inc/opengl_utils.h @@ -36,8 +36,8 @@ extern PFNGLVERTEX2FPROC glVertex2f; BOOL oglu_load_dll(); void oglu_init(); BOOL oglu_ext_exists(char *ext, HDC hdc); -GLuint oglu_build_program(const GLchar *vertSource, const GLchar *fragSource); -GLuint oglu_build_program_from_file(const char *filePath); +GLuint oglu_build_program(const GLchar *vert_source, const GLchar *frag_source); +GLuint oglu_build_program_from_file(const char *file_path); extern PFNGLVIEWPORTPROC glViewport; extern PFNGLBINDTEXTUREPROC glBindTexture; diff --git a/src/opengl_utils.c b/src/opengl_utils.c index f09788a..9d96c28 100644 --- a/src/opengl_utils.c +++ b/src/opengl_utils.c @@ -229,7 +229,7 @@ BOOL oglu_ext_exists(char *ext, HDC hdc) return FALSE; } -GLuint oglu_build_program(const GLchar *vertSource, const GLchar *fragSource) +GLuint oglu_build_program(const GLchar *vert_source, const GLchar *frag_source) { if (!glCreateShader || !glShaderSource || !glCompileShader || !glCreateProgram || !glAttachShader || !glLinkProgram || !glUseProgram || !glDetachShader) @@ -241,8 +241,8 @@ GLuint oglu_build_program(const GLchar *vertSource, const GLchar *fragSource) if (!vert_shader || !frag_shader) return 0; - glShaderSource(vert_shader, 1, &vertSource, NULL); - glShaderSource(frag_shader, 1, &fragSource, NULL); + glShaderSource(vert_shader, 1, &vert_source, NULL); + glShaderSource(frag_shader, 1, &frag_source, NULL); GLint is_compiled = 0; @@ -305,11 +305,11 @@ GLuint oglu_build_program(const GLchar *vertSource, const GLchar *fragSource) return program; } -GLuint oglu_build_program_from_file(const char *filePath) +GLuint oglu_build_program_from_file(const char *file_path) { GLuint program = 0; - FILE *file = fopen(filePath, "rb"); + FILE *file = fopen(file_path, "rb"); if (file) { fseek(file, 0, SEEK_END); diff --git a/src/render_d3d9.c b/src/render_d3d9.c index d16c147..55df9d5 100644 --- a/src/render_d3d9.c +++ b/src/render_d3d9.c @@ -7,6 +7,7 @@ #include "render_d3d9.h" #include "utils.h" #include "wndproc.h" +#include "debug.h" static BOOL d3d9_create_resouces(); @@ -313,7 +314,7 @@ DWORD WINAPI d3d9_render_main(void) (g_ddraw->render.forcefps || WaitForSingleObject(g_ddraw->render.sem, 200) != WAIT_FAILED)) { #if _DEBUG - DrawFrameInfoStart(); + dbg_draw_frame_info_start(); #endif static int tex_index = 0, palIndex = 0; @@ -422,7 +423,7 @@ DWORD WINAPI d3d9_render_main(void) } #if _DEBUG - DrawFrameInfoEnd(); + dbg_draw_frame_info_end(); #endif if (g_ddraw->fps_limiter.tick_length > 0) diff --git a/src/render_gdi.c b/src/render_gdi.c index 44d0850..c09b99e 100644 --- a/src/render_gdi.c +++ b/src/render_gdi.c @@ -5,6 +5,7 @@ #include "opengl_utils.h" #include "utils.h" #include "wndproc.h" +#include "debug.h" DWORD WINAPI gdi_render_main(void) @@ -52,7 +53,7 @@ DWORD WINAPI gdi_render_main(void) (g_ddraw->render.forcefps || WaitForSingleObject(g_ddraw->render.sem, 200) != WAIT_FAILED)) { #if _DEBUG - DrawFrameInfoStart(); + dbg_draw_frame_info_start(); #endif if (g_ddraw->fps_limiter.tick_length > 0) @@ -145,7 +146,7 @@ DWORD WINAPI gdi_render_main(void) LeaveCriticalSection(&g_ddraw->cs); #if _DEBUG - DrawFrameInfoEnd(); + dbg_draw_frame_info_end(); #endif if (g_ddraw->fps_limiter.tick_length > 0) diff --git a/src/render_ogl.c b/src/render_ogl.c index d09ebe7..dc51cd1 100644 --- a/src/render_ogl.c +++ b/src/render_ogl.c @@ -7,6 +7,7 @@ #include "render_gdi.h" #include "render_ogl.h" #include "utils.h" +#include "debug.h" static HGLRC ogl_create_context(HDC hdc); @@ -545,7 +546,7 @@ static void ogl_render() (g_ddraw->render.forcefps || WaitForSingleObject(g_ddraw->render.sem, 200) != WAIT_FAILED)) { #if _DEBUG - DrawFrameInfoStart(); + dbg_draw_frame_info_start(); #endif g_ogl.scale_w = (float)g_ddraw->width / g_ogl.surface_tex_width; @@ -773,7 +774,7 @@ static void ogl_render() SwapBuffers(g_ddraw->render.hdc); #if _DEBUG - DrawFrameInfoEnd(); + dbg_draw_frame_info_end(); #endif if (g_ddraw->fps_limiter.tick_length > 0)