ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-02-22 20:02:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

WIN32 -> _WIN32, _CRT_NONSTDC_NO_DEPRECATE for project files

Browse source
This commit is contained in:
Pan7 2015-09-07 03:35:33 +02:00
parent 8a3387a765
commit 6e1dd532c4
23 changed files with 62 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libs/cmdlib/cmdlib.vcxproj
View file

@ -122,6 +122,9 @@
<ItemGroup>
<ClCompile Include="cmdlib.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\cmdlib.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

3
libs/cmdlib/cmdlib.vcxproj.filters
View file

@ -11,4 +11,7 @@
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\cmdlib.h" />
</ItemGroup>
</Project>

4
plugins/surface_idtech2/surface_idtech2.vcxproj
View file

@ -72,7 +72,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -116,7 +116,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>

4
plugins/textool/textool.vcxproj
View file

@ -72,7 +72,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -116,7 +116,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>

4
radiant/mainframe.cpp
View file

@ -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"

4
radiant/preferences.cpp
View file

@ -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"

14
tools/quake3/common/cmdlib.c
View file

@ -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__ )

4
tools/quake3/common/cmdlib.h
View file

@ -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 );

6
tools/quake3/common/imagelib.c
View file

@ -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 );
}

4
tools/quake3/common/inout.c
View file

@ -33,7 +33,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#ifdef WIN32
#ifdef _WIN32
#include <direct.h>
#include <windows.h>
#endif
@ -49,7 +49,7 @@
// utf8 conversion
#include <glib.h>
#ifdef WIN32
#ifdef _WIN32
HWND hwndOut = NULL;
qboolean lookedForServer = qfalse;
UINT wm_BroadcastCommand = -1;

2
tools/quake3/common/mutex.c
View file

@ -31,7 +31,7 @@
===================================================================
*/
#ifdef WIN32
#ifdef _WIN32
#define USED

3
tools/quake3/common/quake3-common.vcxproj
View file

@ -135,6 +135,9 @@
<ClCompile Include="unzip.c" />
<ClCompile Include="vfs.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="cmdlib.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

3
tools/quake3/common/quake3-common.vcxproj.filters
View file

@ -38,4 +38,7 @@
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="cmdlib.h" />
</ItemGroup>
</Project>

2
tools/quake3/common/threads.c
View file

@ -106,7 +106,7 @@ void RunThreadsOnIndividual( int workcnt, qboolean showpacifier, void ( *func )(
===================================================================
*/
#ifdef WIN32
#ifdef _WIN32
#define USED

2
tools/quake3/q3data/md3lib.c
View file

@ -20,7 +20,7 @@
*/
#include <assert.h>
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#endif
#include "md3lib.h"

2
tools/quake3/q3data/p3dlib.c
View file

@ -21,7 +21,7 @@
#include "p3dlib.h"
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#endif
#include <stdlib.h>

6
tools/quake3/q3data/q3data.c
View file

@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef WIN32
#ifdef _WIN32
#include <io.h>
#endif
#include "q3data.h"
@ -334,7 +334,7 @@ void PackDirectory_r( char *dir ){
#else
#include <sys/types.h>
#ifndef WIN32
#ifndef _WIN32
#include <sys/dir.h>
#else
#include <sys/dirent.h>
@ -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 );
}

2
tools/quake3/q3data/q3data.vcxproj
View file

@ -118,7 +118,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CRT_SECURE_NO_WARNINGS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

8
tools/quake3/q3map2/q3map2.vcxproj
View file

@ -77,8 +77,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -119,8 +119,8 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>Level3</WarningLevel>

2
tools/urt/tools/quake3/q3map2/exportents.c
View file

@ -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 );

12
tools/urt/tools/quake3/q3map2/main.c
View file

@ -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 );

9
tools/urt/tools/quake3/q3map2/q3map2.h
View file

@ -57,11 +57,10 @@
#include <limits.h>
#endif
#ifdef WIN32
#ifdef _WIN32
#include <windows.h>
#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 );

8
tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj
View file

@ -96,8 +96,8 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
@ -193,8 +193,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions);_STLP_DONT_USE_EXCEPTIONS;_STLP_NO_NAMESPACES;_STLP_NO_IOSTREAMS;_WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>.\Debug/q3map2.pch</PrecompiledHeaderOutputFile>