diff --git a/.gitignore b/.gitignore index 1dd1c19d5..4ba05f7ca 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,5 @@ Win32_LIB_ASM_Release /build /build/* /CMakeUserPresets.json -/out \ No newline at end of file +/out +/objs/VC10 diff --git a/src/console.c b/src/console.c index e4bdec0ce..4143e5e06 100644 --- a/src/console.c +++ b/src/console.c @@ -220,7 +220,7 @@ static char *bindtable[NUMINPUTS]; static void CONS_Bind_f(void) { size_t na; - char *newcmd; + char *newcmd = NULL; //size_t newlen = 0; unsigned int i; INT32 key; diff --git a/src/m_menu.c b/src/m_menu.c index de23acbfb..edbbdf2c1 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -10535,7 +10535,7 @@ static void M_StartTimeAttackReplay(INT32 choice) // Player has selected the "REPLAY" from the time attack screen static void M_ReplayTimeAttack(INT32 choice) { - const char *which; + const char *which = NULL; UINT8 error = DFILE_ERROR_NONE; if (currentMenu == &SP_ReplayDef) diff --git a/src/r_picformats.c b/src/r_picformats.c index 7d7f1198d..e4a59f211 100644 --- a/src/r_picformats.c +++ b/src/r_picformats.c @@ -376,7 +376,7 @@ void *Picture_PatchConvert( // Write columns for (INT32 x = 0; x < inwidth; x++) { - post_t *post; + post_t *post = NULL; size_t post_data_offset = 0; boolean was_opaque = false; diff --git a/src/r_textures.c b/src/r_textures.c index 1bc0534ec..0175a080e 100644 --- a/src/r_textures.c +++ b/src/r_textures.c @@ -472,7 +472,7 @@ UINT8 *R_GenerateTexture(size_t texnum) for (x = 0; x < texture->width; x++) { - post_t *post; + post_t *post = NULL; boolean was_opaque = false; column_t *column = &temp_columns[x]; diff --git a/src/sdl/Srb2SDL-vc10.vcxproj b/src/sdl/Srb2SDL-vc10.vcxproj index 462170078..0f0355c6f 100644 --- a/src/sdl/Srb2SDL-vc10.vcxproj +++ b/src/sdl/Srb2SDL-vc10.vcxproj @@ -165,7 +165,22 @@ true false stdcpp17 + HAVE_CURL;%(PreprocessorDefinitions) + ..\..\libs\curl\include;%(AdditionalIncludeDirectories) + + + + + + + + + + + libcurl.dll.a;libz32.a;%(AdditionalDependencies) + ..\..\libs\zlib\win32;..\..\libs\curl\lib32;%(AdditionalLibraryDirectories) + @@ -175,7 +190,50 @@ 4244;4267;4146;4003 + HAVE_CURL;%(PreprocessorDefinitions) + ..\libs\curl\include;%(AdditionalIncludeDirectories) + + + + + + + + + + + libcurl.dll.a;libz32.a;%(AdditionalDependencies) + ..\libs\zlib\win32;..\libs\curl\lib32;%(AdditionalLibraryDirectories) + + + + + false + + + + + true + false + 4244;4267;4146 + HAVE_CURL;%(PreprocessorDefinitions) + ..\libs\curl\include;%(AdditionalIncludeDirectories) + ..\libs\curl\lib64;%(AdditionalModuleDependencies) + + + libcurl.a;%(AdditionalDependencies) + ..\libs\curl\lib64;%(AdditionalLibraryDirectories) + + + + + HAVE_CURL;%(PreprocessorDefinitions) + + + libcurl.a;%(AdditionalDependencies) + ..\libs\curl\lib64;%(AdditionalLibraryDirectories) + @@ -314,7 +372,6 @@ - @@ -400,6 +457,7 @@ + @@ -438,6 +496,8 @@ + + @@ -495,7 +555,6 @@ - @@ -567,7 +626,6 @@ true - @@ -584,4 +642,4 @@ - + \ No newline at end of file diff --git a/src/sdl/Srb2SDL-vc10.vcxproj.filters b/src/sdl/Srb2SDL-vc10.vcxproj.filters index 59bb76b52..183843018 100644 --- a/src/sdl/Srb2SDL-vc10.vcxproj.filters +++ b/src/sdl/Srb2SDL-vc10.vcxproj.filters @@ -255,9 +255,6 @@ Hw_Hardware - - Hw_Hardware - I_Interface @@ -378,9 +375,6 @@ D_Doom - - I_Interface - I_Interface @@ -558,12 +552,16 @@ R_Rend - - P_Play - M_Misc + + + + + + + @@ -753,15 +751,9 @@ Hw_Hardware - - Hw_Hardware - I_Interface - - I_Interface - LUA @@ -1105,21 +1097,25 @@ LUA - - SDLApp - I_Interface R_Rend - - P_Play - M_Misc + + + BLUA + + + LUA + + + R_Rend +