From 6e1dd532c4efee728af3006b7cf189e8475d5a9d Mon Sep 17 00:00:00 2001 From: Pan7 Date: Mon, 7 Sep 2015 03:35:33 +0200 Subject: [PATCH] WIN32 -> _WIN32, _CRT_NONSTDC_NO_DEPRECATE for project files --- libs/cmdlib/cmdlib.vcxproj | 3 +++ libs/cmdlib/cmdlib.vcxproj.filters | 3 +++ plugins/surface_idtech2/surface_idtech2.vcxproj | 4 ++-- plugins/textool/textool.vcxproj | 4 ++-- radiant/mainframe.cpp | 4 ++-- radiant/preferences.cpp | 4 ++-- tools/quake3/common/cmdlib.c | 14 +++++++------- tools/quake3/common/cmdlib.h | 4 ++-- tools/quake3/common/imagelib.c | 6 +++--- tools/quake3/common/inout.c | 4 ++-- tools/quake3/common/mutex.c | 2 +- tools/quake3/common/quake3-common.vcxproj | 3 +++ tools/quake3/common/quake3-common.vcxproj.filters | 3 +++ tools/quake3/common/threads.c | 2 +- tools/quake3/q3data/md3lib.c | 2 +- tools/quake3/q3data/p3dlib.c | 2 +- tools/quake3/q3data/q3data.c | 6 +++--- tools/quake3/q3data/q3data.vcxproj | 2 +- tools/quake3/q3map2/q3map2.vcxproj | 8 ++++---- tools/urt/tools/quake3/q3map2/exportents.c | 2 +- tools/urt/tools/quake3/q3map2/main.c | 12 ++++++------ tools/urt/tools/quake3/q3map2/q3map2.h | 9 +++++---- tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj | 8 ++++---- 23 files changed, 62 insertions(+), 49 deletions(-) diff --git a/libs/cmdlib/cmdlib.vcxproj b/libs/cmdlib/cmdlib.vcxproj index f8fafc75..7e4195fe 100644 --- a/libs/cmdlib/cmdlib.vcxproj +++ b/libs/cmdlib/cmdlib.vcxproj @@ -122,6 +122,9 @@ + + + diff --git a/libs/cmdlib/cmdlib.vcxproj.filters b/libs/cmdlib/cmdlib.vcxproj.filters index d1a82074..487fb166 100644 --- a/libs/cmdlib/cmdlib.vcxproj.filters +++ b/libs/cmdlib/cmdlib.vcxproj.filters @@ -11,4 +11,7 @@ src + + + \ No newline at end of file diff --git a/plugins/surface_idtech2/surface_idtech2.vcxproj b/plugins/surface_idtech2/surface_idtech2.vcxproj index ff8d9758..fc446463 100644 --- a/plugins/surface_idtech2/surface_idtech2.vcxproj +++ b/plugins/surface_idtech2/surface_idtech2.vcxproj @@ -72,7 +72,7 @@ Disabled $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32 + WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE true EnableFastChecks MultiThreadedDLL @@ -116,7 +116,7 @@ $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32 + WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE MultiThreadedDLL Level3 diff --git a/plugins/textool/textool.vcxproj b/plugins/textool/textool.vcxproj index 7028c64e..29a17a6b 100644 --- a/plugins/textool/textool.vcxproj +++ b/plugins/textool/textool.vcxproj @@ -72,7 +72,7 @@ Disabled $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32 + WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE true EnableFastChecks MultiThreadedDLL @@ -116,7 +116,7 @@ $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDLL Level3 diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 9c1a8d4a..cedf14ae 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -2195,7 +2195,7 @@ void clipboard_paste(){ } -#elif defined( WIN32 ) +#elif defined( _WIN32 ) void clipboard_copy(){ Clipboard_CopyMap(); @@ -3562,7 +3562,7 @@ void MainFrame::LoadCommandMap(){ #if defined ( __linux__ ) || defined ( __APPLE__ ) strINI = g_PrefsDlg.m_rc_path->str; -#elif defined( WIN32 ) +#elif defined( _WIN32 ) strINI = g_strGameToolsPath; #else #error "WTF are you compiling this on" diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 63e07699..b0de2f5f 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -501,7 +501,7 @@ qboolean CXMLPropertyBag::WriteXMLFile( const char* pFilename ){ // ============================================================================= // Widget callbacks for PrefsDlg -#if !defined( WIN32 ) +#if !defined( _WIN32 ) // browse for custom editor executable static void OnBtnBrowseEditor( GtkWidget *widget, gpointer data ){ PrefsDlg *dlg = (PrefsDlg*)data; @@ -685,7 +685,7 @@ PrefsDlg::PrefsDlg (){ ========================================================= */ -#if defined( WIN32 ) +#if defined( _WIN32 ) #define TOOLS_ATTRIBUTE "gametools_win32" #define EXECUTABLES_ATTRIBUTE "executables_win32" #define ENGINE_ATTRIBUTE "engine_win32" diff --git a/tools/quake3/common/cmdlib.c b/tools/quake3/common/cmdlib.c index 349d9ac4..bd184433 100644 --- a/tools/quake3/common/cmdlib.c +++ b/tools/quake3/common/cmdlib.c @@ -292,7 +292,7 @@ double I_FloatTime( void ){ void Q_getwd( char *out ){ int i = 0; -#ifdef WIN32 +#ifdef _WIN32 _getcwd( out, 256 ); strncat( out, "\\", sizeof( out ) ); #else @@ -311,7 +311,7 @@ void Q_getwd( char *out ){ void Q_mkdir( const char *path ){ -#ifdef WIN32 +#ifdef _WIN32 if ( _mkdir( path ) != -1 ) { return; } @@ -682,7 +682,7 @@ void SaveFile( const char *filename, const void *buffer, int count ){ -void DefaultExtension( char *path, const char *extension ){ +void DefaultExtension( char *path, const char *extension, size_t length ){ char *src; // // if path doesnt have a .EXT, append extension @@ -698,7 +698,7 @@ void DefaultExtension( char *path, const char *extension ){ src--; } - strncat( path, extension, sizeof( path ) ); + strncat( path, extension, length ); } @@ -780,7 +780,7 @@ void ExtractFileBase( const char *path, char *dest ){ *dest = 0; } -void ExtractFileExtension( const char *path, char *dest ){ +void ExtractFileExtension( const char *path, char *dest, size_t length ){ const char *src; src = path + strlen( path ) - 1; @@ -795,7 +795,7 @@ void ExtractFileExtension( const char *path, char *dest ){ return; } - Q_strncpyz( dest, src, sizeof( dest ) ); + Q_strncpyz( dest, src, length ); } @@ -1078,7 +1078,7 @@ void QCopyFile( const char *from, const char *to ){ } void Sys_Sleep( int n ){ -#ifdef WIN32 +#ifdef _WIN32 Sleep( n ); #endif #if defined ( __linux__ ) || defined ( __APPLE__ ) diff --git a/tools/quake3/common/cmdlib.h b/tools/quake3/common/cmdlib.h index 478cb807..b90308cd 100644 --- a/tools/quake3/common/cmdlib.h +++ b/tools/quake3/common/cmdlib.h @@ -114,14 +114,14 @@ int TryLoadFile( const char *filename, void **bufferptr ); void SaveFile( const char *filename, const void *buffer, int count ); qboolean FileExists( const char *filename ); -void DefaultExtension( char *path, const char *extension ); +void DefaultExtension( char *path, const char *extension, size_t length ); void DefaultPath( char *path, const char *basepath ); void StripFilename( char *path ); void StripExtension( char *path ); void ExtractFilePath( const char *path, char *dest ); void ExtractFileBase( const char *path, char *dest ); -void ExtractFileExtension( const char *path, char *dest ); +void ExtractFileExtension( const char *path, char *dest, size_t length ); int ParseNum( const char *str ); diff --git a/tools/quake3/common/imagelib.c b/tools/quake3/common/imagelib.c index e857c73a..3176e65d 100644 --- a/tools/quake3/common/imagelib.c +++ b/tools/quake3/common/imagelib.c @@ -823,7 +823,7 @@ void LoadBMP( const char *filename, byte **pic, byte **palette, int *width, int void Load256Image( const char *name, byte **pixels, byte **palette, int *width, int *height ){ char ext[128]; - ExtractFileExtension( name, ext ); + ExtractFileExtension( name, ext, sizeof( ext ) ); if ( !Q_stricmp( ext, "lbm" ) ) { LoadLBM( name, pixels, palette ); if ( width ) { @@ -856,7 +856,7 @@ void Save256Image( const char *name, byte *pixels, byte *palette, int width, int height ){ char ext[128]; - ExtractFileExtension( name, ext ); + ExtractFileExtension( name, ext, sizeof( ext ) ); if ( !Q_stricmp( ext, "lbm" ) ) { WriteLBMfile( name, pixels, width, height, palette ); } @@ -1193,7 +1193,7 @@ void Load32BitImage( const char *name, unsigned **pixels, int *width, int *heig int i; int v; - ExtractFileExtension( name, ext ); + ExtractFileExtension( name, ext, sizeof( ext ) ); if ( !Q_stricmp( ext, "tga" ) ) { LoadTGA( name, (byte **)pixels, width, height ); } diff --git a/tools/quake3/common/inout.c b/tools/quake3/common/inout.c index d0eaa871..d998ce18 100644 --- a/tools/quake3/common/inout.c +++ b/tools/quake3/common/inout.c @@ -33,7 +33,7 @@ #include #include -#ifdef WIN32 +#ifdef _WIN32 #include #include #endif @@ -49,7 +49,7 @@ // utf8 conversion #include -#ifdef WIN32 +#ifdef _WIN32 HWND hwndOut = NULL; qboolean lookedForServer = qfalse; UINT wm_BroadcastCommand = -1; diff --git a/tools/quake3/common/mutex.c b/tools/quake3/common/mutex.c index c9242f11..33e64276 100644 --- a/tools/quake3/common/mutex.c +++ b/tools/quake3/common/mutex.c @@ -31,7 +31,7 @@ =================================================================== */ -#ifdef WIN32 +#ifdef _WIN32 #define USED diff --git a/tools/quake3/common/quake3-common.vcxproj b/tools/quake3/common/quake3-common.vcxproj index 33b4d9df..9172a8f8 100644 --- a/tools/quake3/common/quake3-common.vcxproj +++ b/tools/quake3/common/quake3-common.vcxproj @@ -135,6 +135,9 @@ + + + diff --git a/tools/quake3/common/quake3-common.vcxproj.filters b/tools/quake3/common/quake3-common.vcxproj.filters index 31eeae7d..24dae42e 100644 --- a/tools/quake3/common/quake3-common.vcxproj.filters +++ b/tools/quake3/common/quake3-common.vcxproj.filters @@ -38,4 +38,7 @@ src + + + \ No newline at end of file diff --git a/tools/quake3/common/threads.c b/tools/quake3/common/threads.c index 7b66e8b8..46c79862 100644 --- a/tools/quake3/common/threads.c +++ b/tools/quake3/common/threads.c @@ -106,7 +106,7 @@ void RunThreadsOnIndividual( int workcnt, qboolean showpacifier, void ( *func )( =================================================================== */ -#ifdef WIN32 +#ifdef _WIN32 #define USED diff --git a/tools/quake3/q3data/md3lib.c b/tools/quake3/q3data/md3lib.c index 78805b44..ae79753a 100644 --- a/tools/quake3/q3data/md3lib.c +++ b/tools/quake3/q3data/md3lib.c @@ -20,7 +20,7 @@ */ #include -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include "md3lib.h" diff --git a/tools/quake3/q3data/p3dlib.c b/tools/quake3/q3data/p3dlib.c index 9127e8fc..4154838f 100644 --- a/tools/quake3/q3data/p3dlib.c +++ b/tools/quake3/q3data/p3dlib.c @@ -21,7 +21,7 @@ #include "p3dlib.h" -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include diff --git a/tools/quake3/q3data/q3data.c b/tools/quake3/q3data/q3data.c index 50774834..90115d9e 100644 --- a/tools/quake3/q3data/q3data.c +++ b/tools/quake3/q3data/q3data.c @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifdef WIN32 +#ifdef _WIN32 #include #endif #include "q3data.h" @@ -334,7 +334,7 @@ void PackDirectory_r( char *dir ){ #else #include -#ifndef WIN32 +#ifndef _WIN32 #include #else #include @@ -650,7 +650,7 @@ int main( int argc, char **argv ){ printf( "--------------- %s ---------------\n", argv[i] ); // load the script strcpy( path, argv[i] ); - DefaultExtension( path, ".qdt" ); + DefaultExtension( path, ".qdt", sizeof( path ) ); if ( !gamedir[0] ) { SetQdirFromPath( path ); } diff --git a/tools/quake3/q3data/q3data.vcxproj b/tools/quake3/q3data/q3data.vcxproj index 0c6c12e3..70511621 100644 --- a/tools/quake3/q3data/q3data.vcxproj +++ b/tools/quake3/q3data/q3data.vcxproj @@ -118,7 +118,7 @@ $(SolutionDir)\tools\quake3\common;$(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) - NDEBUG;_CRT_SECURE_NO_WARNINGS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;inline=__inline;%(PreprocessorDefinitions) + NDEBUG;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;inline=__inline;%(PreprocessorDefinitions) MultiThreadedDLL Level3 ProgramDatabase diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index 75326733..9aef1f72 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -77,8 +77,8 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;$(SolutionDir)\tools\quake3\common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32 + $(SolutionDir)\tools\quake3\common;$(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE true EnableFastChecks MultiThreadedDLL @@ -119,8 +119,8 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;$(SolutionDir)\tools\quake3\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32 + $(SolutionDir)\tools\quake3\common;$(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE MultiThreadedDLL Level3 diff --git a/tools/urt/tools/quake3/q3map2/exportents.c b/tools/urt/tools/quake3/q3map2/exportents.c index 578f9e42..89fcf22a 100644 --- a/tools/urt/tools/quake3/q3map2/exportents.c +++ b/tools/urt/tools/quake3/q3map2/exportents.c @@ -98,7 +98,7 @@ int ExportEntitiesMain( int argc, char **argv ){ /* do some path mangling */ strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); StripExtension( source ); - DefaultExtension( source, ".bsp" ); + DefaultExtension( source, ".bsp", sizeof( source ) ); /* load the bsp */ Sys_Printf( "Loading %s\n", source ); diff --git a/tools/urt/tools/quake3/q3map2/main.c b/tools/urt/tools/quake3/q3map2/main.c index 857a9b56..8ef5ded5 100644 --- a/tools/urt/tools/quake3/q3map2/main.c +++ b/tools/urt/tools/quake3/q3map2/main.c @@ -254,11 +254,11 @@ int BSPInfo( int count, char **fileNames ){ /* mangle filename and get size */ strcpy( source, fileNames[ i ] ); - ExtractFileExtension( source, ext ); + ExtractFileExtension( source, ext, sizeof( ext ) ); if ( !Q_stricmp( ext, "map" ) ) { StripExtension( source ); } - DefaultExtension( source, ".bsp" ); + DefaultExtension( source, ".bsp", sizeof( source ) ); f = fopen( source, "rb" ); if ( f ) { size = Q_filelength( f ); @@ -317,7 +317,7 @@ int ScaleBSPMain( int argc, char **argv ){ /* do some path mangling */ strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); StripExtension( source ); - DefaultExtension( source, ".bsp" ); + DefaultExtension( source, ".bsp", sizeof( source ) ); /* load the bsp */ Sys_Printf( "Loading %s\n", source ); @@ -389,7 +389,7 @@ int ScaleBSPMain( int argc, char **argv ){ /* write the bsp */ UnparseEntities(); StripExtension( source ); - DefaultExtension( source, "_s.bsp" ); + DefaultExtension( source, "_s.bsp", sizeof( source ) ); Sys_Printf( "Writing %s\n", source ); WriteBSPFile( source ); @@ -445,7 +445,7 @@ int ConvertBSPMain( int argc, char **argv ){ /* clean up map name */ strcpy( source, ExpandArg( argv[ i ] ) ); StripExtension( source ); - DefaultExtension( source, ".bsp" ); + DefaultExtension( source, ".bsp", sizeof( source ) ); LoadShaderInfo(); @@ -466,7 +466,7 @@ int ConvertBSPMain( int argc, char **argv ){ /* write bsp */ StripExtension( source ); - DefaultExtension( source, "_c.bsp" ); + DefaultExtension( source, "_c.bsp", sizeof( source ) ); Sys_Printf( "Writing %s\n", source ); WriteBSPFile( source ); diff --git a/tools/urt/tools/quake3/q3map2/q3map2.h b/tools/urt/tools/quake3/q3map2/q3map2.h index 330d607c..552b3689 100644 --- a/tools/urt/tools/quake3/q3map2/q3map2.h +++ b/tools/urt/tools/quake3/q3map2/q3map2.h @@ -57,11 +57,10 @@ #include #endif -#ifdef WIN32 +#ifdef _WIN32 #include - #define _CRT_SECURE_NO_WARNINGS #ifndef MAX_OS_PATH - #define MAX_OS_PATH PATH_MAX + #define MAX_OS_PATH MAX_PATH #endif #endif @@ -102,7 +101,7 @@ #endif #if 1 - #ifdef WIN32 + #ifdef _WIN32 #define Q_stricmp stricmp #define Q_strncasecmp strnicmp #else @@ -1747,6 +1746,8 @@ void ExportLightmaps( void ); int ExportLightmapsMain( int argc, char **argv ); int ImportLightmapsMain( int argc, char **argv ); +void ClearLightMap( rawLightmap_t *lm ); + void SetupSurfaceLightmaps( void ); void StitchSurfaceLightmaps( void ); void StoreSurfaceLightmaps( void ); diff --git a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj index e648eefc..ae363b4f 100644 --- a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj +++ b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj @@ -96,8 +96,8 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;$(SolutionDir)\tools\quake3\common;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32 + $(SolutionDir)\tools\quake3\common;$(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE true MultiThreadedDLL true @@ -193,8 +193,8 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;$(SolutionDir)\tools\quake3\common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32 + $(SolutionDir)\tools\quake3\common;$(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\GtkRadiant-libs\jpeg-9a;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\lib\glib-2.0\include;$(SolutionDir)\..\GtkRadiant-libs\glib-2.34.3\include\glib-2.0;$(SolutionDir)\..\GtkRadiant-libs\gtk-3.6.4\include\gtk-3.0;$(SolutionDir)\..\GtkRadiant-libs\pango-1.30.1\include\pango-1.0;$(SolutionDir)\..\GtkRadiant-libs\cairo-1.10.2\include\cairo;$(SolutionDir)\..\GtkRadiant-libs\gdk-pixbuf-2.26.5\include\gdk-pixbuf-2.0;$(SolutionDir)\..\GtkRadiant-libs\atk-2.6.0\include\atk-1.0;$(SolutionDir)\..\GtkRadiant-libs\STLport-5.2.1\stlport;$(SolutionDir)\..\GtkRadiant-libs\gtkglext-1.3\include;$(SolutionDir)\..\GtkRadiant-libs\libxml2-2.9.2\include;$(SolutionDir)\..\GtkRadiant-libs\lpng1618;$(SolutionDir)\..\GtkRadiant-libs\libiconv-1.14\woe32dll\libiconv;$(SolutionDir)\..\GtkRadiant-libs\gettext-0.19.5.1\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE true MultiThreadedDLL .\Debug/q3map2.pch