From d8314fa7aecf6dc2a4e89fafcd18a57abb6a91c2 Mon Sep 17 00:00:00 2001 From: rambetter Date: Mon, 21 Feb 2011 14:37:49 +0000 Subject: [PATCH] This is a major change that updates the 3rd party libs on Windows builds. A couple of things are broken right now: - OpenGL font in Windows not appearing (expected to be broken, will fix) - Linux build broken because it loads some .vcproj files that are removed - 3rd party libs are downloaded from porky.nerius.com, not id Software git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@473 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- COMPILING | 1 - config.py | 111 +- ...d2d.vcproj => bkgrnd2d.vcproj.out-of-date} | 0 ...vcproj => bobToolz_gtk.vcproj.out-of-date} | 0 contrib/camera/camera.vcproj | 79 +- contrib/camera/camera_VC9.vcproj | 249 -- ...f.vcproj => gtkgensurf.vcproj.out-of-date} | 0 ...z.vcproj => hydratoolz.vcproj.out-of-date} | 0 ...View.vcproj => PrtView.vcproj.out-of-date} | 0 ...{ufoai.vcproj => ufoai.vcproj.out-of-date} | 0 gen.vcproj => gen.vcproj.out-of-date | 0 libs/cmdlib/cmdlib.vcproj | 178 +- libs/ddslib/ddslib.vcproj | 178 +- libs/ddslib/ddslib_VC9.vcproj | 167 -- libs/l_net/l_net.vcproj | 184 +- libs/l_net/l_net_VC9.vcproj | 175 -- libs/mathlib/mathlib.vcproj | 194 +- libs/md5lib/md5lib.vcproj | 182 +- libs/md5lib/md5lib_VC9.vcproj | 175 -- libs/picomodel/picomodel.vcproj | 299 +- libs/picomodel/picomodel_VC9.vcproj | 268 -- libs/splines/Splines.vcproj | 85 - libs/splines/Splines_VC9.vcproj | 223 -- .../splines.vcproj} | 72 +- libs/synapse/synapse.vcproj | 180 +- libs/synapse/synapse_VC9.vcproj | 167 -- .../{fgd.vcproj => fgd.vcproj.out-of-date} | 0 plugins/entity/entity.vcproj | 262 +- plugins/entity/entity_VC9.vcproj | 273 -- plugins/image/image.vcproj | 88 +- plugins/image/image_VC9.vcproj | 245 -- plugins/image/jpeg.cpp | 5 + ...gehl.vcproj => imagehl.vcproj.out-of-date} | 0 ...gem8.vcproj => imagem8.vcproj.out-of-date} | 0 plugins/imagepng/imagepng.vcproj | 218 +- plugins/imagepng/imagepng_VC9.vcproj | 205 -- plugins/imagepng/plugin.cpp | 10 +- ...wal.vcproj => imagewal.vcproj.out-of-date} | 0 plugins/map/map.vcproj | 240 +- plugins/map/map_VC9.vcproj | 242 -- plugins/mapxml/mapxml.vcproj | 240 +- plugins/mapxml/mapxml_VC9.vcproj | 242 -- plugins/model/model.vcproj | 258 +- plugins/model/model_VC9.vcproj | 269 -- ...ample.vcproj => sample.vcproj.out-of-date} | 0 plugins/shaders/shaders.vcproj | 224 +- plugins/shaders/shaders_VC9.vcproj | 213 -- ....vcproj => spritemodel.vcproj.out-of-date} | 0 plugins/surface/surface.vcproj | 226 +- plugins/surface/surface_VC9.vcproj | 217 -- ...oj => surface_heretic2.vcproj.out-of-date} | 0 ...proj => surface_quake2.vcproj.out-of-date} | 0 ...cproj => surface_ufoai.vcproj.out-of-date} | 0 ...Tool.vcproj => TexTool.vcproj.out-of-date} | 0 ...fspak.vcproj => vfspak.vcproj.out-of-date} | 0 plugins/vfspk3/vfspk3.vcproj | 230 +- plugins/vfspk3/vfspk3_VC9.vcproj | 221 -- ...fswad.vcproj => vfswad.vcproj.out-of-date} | 0 radiant.sln | 108 +- radiant/preferences.cpp | 7 - radiant/radiant.vcproj | 2132 +------------- radiant/radiant_VC9.vcproj | 2459 ----------------- radiant_VC9.sln | 169 -- ...{q2map.vcproj => q2map.vcproj.out-of-date} | 0 ...data3.vcproj => qdata3.vcproj.out-of-date} | 0 ...roj => qdata3_heretic2.vcproj.out-of-date} | 0 .../quake3/common/quake3-common.vcproj | 66 +- ...3data.vcproj => q3data.vcproj.out-of-date} | 0 tools/quake3/q3map2/q3map2.h | 3 - tools/quake3/q3map2/q3map2.vcproj | 352 +-- tools/quake3/q3map2/q3map2_VC9.vcproj | 480 ---- 71 files changed, 2861 insertions(+), 10210 deletions(-) rename contrib/bkgrnd2d/{bkgrnd2d.vcproj => bkgrnd2d.vcproj.out-of-date} (100%) rename contrib/bobtoolz/{bobToolz_gtk.vcproj => bobToolz_gtk.vcproj.out-of-date} (100%) delete mode 100755 contrib/camera/camera_VC9.vcproj rename contrib/gtkgensurf/{gtkgensurf.vcproj => gtkgensurf.vcproj.out-of-date} (100%) rename contrib/hydratoolz/{hydratoolz.vcproj => hydratoolz.vcproj.out-of-date} (100%) rename contrib/prtview/{PrtView.vcproj => PrtView.vcproj.out-of-date} (100%) rename contrib/ufoai/{ufoai.vcproj => ufoai.vcproj.out-of-date} (100%) rename gen.vcproj => gen.vcproj.out-of-date (100%) delete mode 100755 libs/ddslib/ddslib_VC9.vcproj delete mode 100755 libs/l_net/l_net_VC9.vcproj delete mode 100755 libs/md5lib/md5lib_VC9.vcproj delete mode 100755 libs/picomodel/picomodel_VC9.vcproj delete mode 100644 libs/splines/Splines.vcproj delete mode 100755 libs/splines/Splines_VC9.vcproj rename libs/{cmdlib/cmdlib_VC9.vcproj => splines/splines.vcproj} (64%) mode change 100755 => 100644 delete mode 100755 libs/synapse/synapse_VC9.vcproj rename plugins/eclassfgd/{fgd.vcproj => fgd.vcproj.out-of-date} (100%) delete mode 100755 plugins/entity/entity_VC9.vcproj delete mode 100755 plugins/image/image_VC9.vcproj rename plugins/imagehl/{imagehl.vcproj => imagehl.vcproj.out-of-date} (100%) rename plugins/imagem8/{imagem8.vcproj => imagem8.vcproj.out-of-date} (100%) delete mode 100755 plugins/imagepng/imagepng_VC9.vcproj rename plugins/imagewal/{imagewal.vcproj => imagewal.vcproj.out-of-date} (100%) delete mode 100755 plugins/map/map_VC9.vcproj delete mode 100755 plugins/mapxml/mapxml_VC9.vcproj delete mode 100755 plugins/model/model_VC9.vcproj rename plugins/sample/{sample.vcproj => sample.vcproj.out-of-date} (100%) delete mode 100755 plugins/shaders/shaders_VC9.vcproj rename plugins/spritemodel/{spritemodel.vcproj => spritemodel.vcproj.out-of-date} (100%) delete mode 100755 plugins/surface/surface_VC9.vcproj rename plugins/surface_heretic2/{surface_heretic2.vcproj => surface_heretic2.vcproj.out-of-date} (100%) rename plugins/surface_quake2/{surface_quake2.vcproj => surface_quake2.vcproj.out-of-date} (100%) rename plugins/surface_ufoai/{surface_ufoai.vcproj => surface_ufoai.vcproj.out-of-date} (100%) rename plugins/textool/{TexTool.vcproj => TexTool.vcproj.out-of-date} (100%) rename plugins/vfspak/{vfspak.vcproj => vfspak.vcproj.out-of-date} (100%) delete mode 100755 plugins/vfspk3/vfspk3_VC9.vcproj rename plugins/vfswad/{vfswad.vcproj => vfswad.vcproj.out-of-date} (100%) delete mode 100755 radiant/radiant_VC9.vcproj delete mode 100644 radiant_VC9.sln rename tools/quake2/q2map/{q2map.vcproj => q2map.vcproj.out-of-date} (100%) rename tools/quake2/qdata/{qdata3.vcproj => qdata3.vcproj.out-of-date} (100%) rename tools/quake2/qdata_heretic2/{qdata3_heretic2.vcproj => qdata3_heretic2.vcproj.out-of-date} (100%) rename libs/mathlib/mathlib_VC9.vcproj => tools/quake3/common/quake3-common.vcproj (62%) mode change 100755 => 100644 rename tools/quake3/q3data/{q3data.vcproj => q3data.vcproj.out-of-date} (100%) delete mode 100755 tools/quake3/q3map2/q3map2_VC9.vcproj diff --git a/COMPILING b/COMPILING index 0a5c74d8..902dd595 100644 --- a/COMPILING +++ b/COMPILING @@ -35,7 +35,6 @@ dependencies: - libxml2 >= 2.0.0 - zlib >= 1.2.0 (for archivezip module) - libpng >= 1.2.0 (for imagepng module) -- libmhash = 0.9.0 (for q3map2) build: Execute 'scons' in the directory containing SConscript diff --git a/config.py b/config.py index 86231cee..2134b07f 100644 --- a/config.py +++ b/config.py @@ -273,60 +273,71 @@ class Config: self.FetchGamePaks( self.install_directory ) # NOTE: unrelated to self.setup_platforms - grab support files and binaries and install them if ( self.platform == 'Windows' ): - depsfile = 'GtkR-deps-1.6-3.zip' - if ( not os.path.exists( depsfile ) ): - cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.1/%s' % depsfile ] + backup_cwd = os.getcwd() + for lib_archive in [ + 'gtk+-bundle-2.16.6-20100912-2-win32.zip', + 'gtkglext-1.2.0-3-win32.zip', + 'libxml2-2.7.3-2-win32.zip', + 'jpeg-8c-4-win32.zip', + 'STLport-5.2.1-4.zip' + ]: + if ( not os.path.exists( lib_archive ) ): + cmd = [ 'wget', '-N', 'http://porky.nerius.com/radiant-libs-win32/%s' % lib_archive ] + print( repr( cmd ) ) + subprocess.check_call( cmd ) + lib_archive_path = os.path.abspath( lib_archive ) + os.chdir( os.path.dirname( backup_cwd ) ) + cmd = [ 'unzip', '-o', lib_archive_path ] + print( repr( cmd ) ) + subprocess.check_call( cmd ) + os.chdir( backup_cwd ) + + # copy all the dependent runtime data to the install directory + srcdir = os.path.dirname( backup_cwd ) + for dll in [ + 'gtk-2.16.6/bin/freetype6.dll', + 'gtk-2.16.6/bin/intl.dll', + 'gtk-2.16.6/bin/libasprintf-0.dll', + 'gtk-2.16.6/bin/libatk-1.0-0.dll', + 'gtk-2.16.6/bin/libcairo-2.dll', + 'gtk-2.16.6/bin/libexpat-1.dll', + 'gtk-2.16.6/bin/libfontconfig-1.dll', + 'gtk-2.16.6/bin/libgailutil-18.dll', + 'gtk-2.16.6/bin/libgcc_s_dw2-1.dll', + 'gtk-2.16.6/bin/libgdk-win32-2.0-0.dll', + 'gtk-2.16.6/bin/libgdk_pixbuf-2.0-0.dll', + 'gtk-2.16.6/bin/libgio-2.0-0.dll', + 'gtk-2.16.6/bin/libglib-2.0-0.dll', + 'gtk-2.16.6/bin/libgmodule-2.0-0.dll', + 'gtk-2.16.6/bin/libgobject-2.0-0.dll', + 'gtk-2.16.6/bin/libgthread-2.0-0.dll', + 'gtk-2.16.6/bin/libgtk-win32-2.0-0.dll', + 'gtk-2.16.6/bin/libpango-1.0-0.dll', + 'gtk-2.16.6/bin/libpangocairo-1.0-0.dll', + 'gtk-2.16.6/bin/libpangoft2-1.0-0.dll', + 'gtk-2.16.6/bin/libpangowin32-1.0-0.dll', + 'gtk-2.16.6/bin/libpng14-14.dll', + 'gtk-2.16.6/bin/zlib1.dll', + 'gtk-2.16.6/lib/GNU.Gettext.dll', + 'gtk-2.16.6/lib/gtk-2.0/2.10.0/engines/libpixmap.dll', + 'gtk-2.16.6/lib/gtk-2.0/2.10.0/engines/libwimp.dll', + 'gtk-2.16.6/lib/gtk-2.0/modules/libgail.dll', + 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll', + 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll', + 'libxml2-2.7.3/bin/libxml2-2.dll' + ]: + cmd = [ 'cp', '-v', os.path.join( srcdir, dll ), 'install' ] print( repr( cmd ) ) subprocess.check_call( cmd ) - - # extract one directoy above - f = os.path.abspath( depsfile ) - backup_cwd = os.getcwd() - os.chdir( os.path.dirname( backup_cwd ) ) - cmd = [ 'unzip', '-o', f ] + for extra in [ + 'gtk-2.16.6/etc', + 'gtk-2.16.6/share', + 'gtkglext-1.2.0/share', + 'libxml2-2.7.3/share' + ]: + cmd = [ 'cp', '-r', '-v', os.path.join( srcdir, extra ), 'install' ] print( repr( cmd ) ) subprocess.check_call( cmd ) - os.chdir( backup_cwd ) - - # copy all the dependent runtime data to the install directory - srcdir = os.path.dirname( backup_cwd ) - for f in [ - 'libxml2/bin/libxml2.dll', - 'gtk2/bin/libglib-2.0-0.dll', - 'gtk2/bin/libgobject-2.0-0.dll', - 'gtk2/bin/libgdk-win32-2.0-0.dll', - 'gtk2/bin/libgtk-win32-2.0-0.dll', - 'gtk2/bin/intl.dll', - 'gtk2/bin/libatk-1.0-0.dll', - 'gtk2/bin/libcairo-2.dll', - 'gtk2/bin/libgdk_pixbuf-2.0-0.dll', - 'gtk2/bin/libgmodule-2.0-0.dll', - 'gtk2/bin/libpng13.dll', - 'gtk2/bin/libpango-1.0-0.dll', - 'gtk2/bin/libpangoft2-1.0-0.dll', - 'gtk2/bin/libpangocairo-1.0-0.dll', - 'gtk2/bin/libpangowin32-1.0-0.dll', - 'gtk2/lib/libgtkglext-win32-1.0-0.dll', - 'gtk2/lib/libgdkglext-win32-1.0-0.dll', - 'gtk2/lib/iconv.dll', - 'gtk2/zlib1.dll', -# 'freetype-dev_2.4.2-1_win32/bin/freetype6.dll', -# 'fontconfig-dev_2.8.0-2_win32/bin/libfontconfig-1.dll', -# 'expat_2.0.1-1_win32/bin/libexpat-1.dll', - ]: - cmd = [ 'cp', '-v', os.path.join( srcdir, f ), 'install' ] - print( repr( cmd ) ) - subprocess.check_call( cmd ) - for d in [ - 'gtk2/etc', - 'gtk2/share', -# 'fontconfig-dev_2.8.0-2_win32/etc', -# 'fontconfig-dev_2.8.0-2_win32/share', -# 'freetype-dev_2.4.2-1_win32/share', - ]: - cmd = [ 'cp', '-r', '-v', os.path.join( srcdir, d ), 'install' ] - print( repr( cmd ) ) - subprocess.check_call( cmd ) # parse the config statement line to produce/update an existing config list # the configs expose a list of keywords and accepted values, which the engine parses out diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj b/contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date similarity index 100% rename from contrib/bkgrnd2d/bkgrnd2d.vcproj rename to contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date diff --git a/contrib/bobtoolz/bobToolz_gtk.vcproj b/contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date similarity index 100% rename from contrib/bobtoolz/bobToolz_gtk.vcproj rename to contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date diff --git a/contrib/camera/camera.vcproj b/contrib/camera/camera.vcproj index 8900cec0..255bb6ca 100644 --- a/contrib/camera/camera.vcproj +++ b/contrib/camera/camera.vcproj @@ -1,10 +1,11 @@ - + - @@ -96,7 +94,6 @@ OutputDirectory="$(SolutionDir)\install\modules" IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)" ConfigurationType="2" - CharacterSet="2" > - @@ -172,8 +167,8 @@ - - - - - - - - - - - - - - - - diff --git a/contrib/camera/camera_VC9.vcproj b/contrib/camera/camera_VC9.vcproj deleted file mode 100755 index bf1b24cd..00000000 --- a/contrib/camera/camera_VC9.vcproj +++ /dev/null @@ -1,249 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/contrib/gtkgensurf/gtkgensurf.vcproj b/contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date similarity index 100% rename from contrib/gtkgensurf/gtkgensurf.vcproj rename to contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date diff --git a/contrib/hydratoolz/hydratoolz.vcproj b/contrib/hydratoolz/hydratoolz.vcproj.out-of-date similarity index 100% rename from contrib/hydratoolz/hydratoolz.vcproj rename to contrib/hydratoolz/hydratoolz.vcproj.out-of-date diff --git a/contrib/prtview/PrtView.vcproj b/contrib/prtview/PrtView.vcproj.out-of-date similarity index 100% rename from contrib/prtview/PrtView.vcproj rename to contrib/prtview/PrtView.vcproj.out-of-date diff --git a/contrib/ufoai/ufoai.vcproj b/contrib/ufoai/ufoai.vcproj.out-of-date similarity index 100% rename from contrib/ufoai/ufoai.vcproj rename to contrib/ufoai/ufoai.vcproj.out-of-date diff --git a/gen.vcproj b/gen.vcproj.out-of-date similarity index 100% rename from gen.vcproj rename to gen.vcproj.out-of-date diff --git a/libs/cmdlib/cmdlib.vcproj b/libs/cmdlib/cmdlib.vcproj index 5c88c539..94d4c253 100644 --- a/libs/cmdlib/cmdlib.vcproj +++ b/libs/cmdlib/cmdlib.vcproj @@ -1,52 +1,154 @@ - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - + + + + diff --git a/libs/ddslib/ddslib.vcproj b/libs/ddslib/ddslib.vcproj index 4b194e50..b0b689c0 100644 --- a/libs/ddslib/ddslib.vcproj +++ b/libs/ddslib/ddslib.vcproj @@ -1,57 +1,153 @@ - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + - \ No newline at end of file + diff --git a/libs/ddslib/ddslib_VC9.vcproj b/libs/ddslib/ddslib_VC9.vcproj deleted file mode 100755 index b4348547..00000000 --- a/libs/ddslib/ddslib_VC9.vcproj +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/l_net/l_net.vcproj b/libs/l_net/l_net.vcproj index 1b9a4173..dd883685 100644 --- a/libs/l_net/l_net.vcproj +++ b/libs/l_net/l_net.vcproj @@ -1,61 +1,157 @@ - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - - - - - + - \ No newline at end of file + diff --git a/libs/l_net/l_net_VC9.vcproj b/libs/l_net/l_net_VC9.vcproj deleted file mode 100755 index 7a4da810..00000000 --- a/libs/l_net/l_net_VC9.vcproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/mathlib/mathlib.vcproj b/libs/mathlib/mathlib.vcproj index fd40d76d..9d255797 100644 --- a/libs/mathlib/mathlib.vcproj +++ b/libs/mathlib/mathlib.vcproj @@ -1,65 +1,169 @@ - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - + - + - + - - - - - + - \ No newline at end of file + diff --git a/libs/md5lib/md5lib.vcproj b/libs/md5lib/md5lib.vcproj index af6ca9d9..8da037cb 100644 --- a/libs/md5lib/md5lib.vcproj +++ b/libs/md5lib/md5lib.vcproj @@ -1,57 +1,159 @@ - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + - - - + - \ No newline at end of file + diff --git a/libs/md5lib/md5lib_VC9.vcproj b/libs/md5lib/md5lib_VC9.vcproj deleted file mode 100755 index d348c8ce..00000000 --- a/libs/md5lib/md5lib_VC9.vcproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/picomodel/picomodel.vcproj b/libs/picomodel/picomodel.vcproj index 8dafe75e..1cfa803c 100644 --- a/libs/picomodel/picomodel.vcproj +++ b/libs/picomodel/picomodel.vcproj @@ -1,107 +1,244 @@ - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - \ No newline at end of file + diff --git a/libs/picomodel/picomodel_VC9.vcproj b/libs/picomodel/picomodel_VC9.vcproj deleted file mode 100755 index 62f453f1..00000000 --- a/libs/picomodel/picomodel_VC9.vcproj +++ /dev/null @@ -1,268 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/splines/Splines.vcproj b/libs/splines/Splines.vcproj deleted file mode 100644 index d85c297b..00000000 --- a/libs/splines/Splines.vcproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libs/splines/Splines_VC9.vcproj b/libs/splines/Splines_VC9.vcproj deleted file mode 100755 index 8e8a5d8c..00000000 --- a/libs/splines/Splines_VC9.vcproj +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/libs/cmdlib/cmdlib_VC9.vcproj b/libs/splines/splines.vcproj old mode 100755 new mode 100644 similarity index 64% rename from libs/cmdlib/cmdlib_VC9.vcproj rename to libs/splines/splines.vcproj index 1ca00c69..83cc0c3f --- a/libs/cmdlib/cmdlib_VC9.vcproj +++ b/libs/splines/splines.vcproj @@ -1,11 +1,11 @@ - + - - - - + + + + + + + + + + + + + + + + + diff --git a/libs/synapse/synapse.vcproj b/libs/synapse/synapse.vcproj index 7f1f136b..95b4dbc2 100644 --- a/libs/synapse/synapse.vcproj +++ b/libs/synapse/synapse.vcproj @@ -1,57 +1,155 @@ - + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + - \ No newline at end of file + diff --git a/libs/synapse/synapse_VC9.vcproj b/libs/synapse/synapse_VC9.vcproj deleted file mode 100755 index fc1cc3b9..00000000 --- a/libs/synapse/synapse_VC9.vcproj +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/eclassfgd/fgd.vcproj b/plugins/eclassfgd/fgd.vcproj.out-of-date similarity index 100% rename from plugins/eclassfgd/fgd.vcproj rename to plugins/eclassfgd/fgd.vcproj.out-of-date diff --git a/plugins/entity/entity.vcproj b/plugins/entity/entity.vcproj index 1536d3b7..694cee01 100644 --- a/plugins/entity/entity.vcproj +++ b/plugins/entity/entity.vcproj @@ -1,101 +1,205 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/plugins/entity/entity_VC9.vcproj b/plugins/entity/entity_VC9.vcproj deleted file mode 100755 index 2206d770..00000000 --- a/plugins/entity/entity_VC9.vcproj +++ /dev/null @@ -1,273 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/image/image.vcproj b/plugins/image/image.vcproj index 6db24b29..916a15ee 100644 --- a/plugins/image/image.vcproj +++ b/plugins/image/image.vcproj @@ -1,10 +1,11 @@ - + - @@ -96,8 +94,6 @@ OutputDirectory="$(SolutionDir)\install\modules" IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)" ConfigurationType="2" - CharacterSet="2" - WholeProgramOptimization="1" > - @@ -173,8 +167,8 @@ - - - - - - - - - - - - - - - - - - diff --git a/plugins/image/image_VC9.vcproj b/plugins/image/image_VC9.vcproj deleted file mode 100755 index d5f78f60..00000000 --- a/plugins/image/image_VC9.vcproj +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/image/jpeg.cpp b/plugins/image/jpeg.cpp index 66df32ff..5f1d0dc4 100644 --- a/plugins/image/jpeg.cpp +++ b/plugins/image/jpeg.cpp @@ -34,6 +34,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // Leonardo Zide (leo@lokigames.com) // +#ifdef _WIN32 +// Ugly hack so that INT32 is defined before jmorecfg.h is parsed. +#include +#endif + #include #include #include diff --git a/plugins/imagehl/imagehl.vcproj b/plugins/imagehl/imagehl.vcproj.out-of-date similarity index 100% rename from plugins/imagehl/imagehl.vcproj rename to plugins/imagehl/imagehl.vcproj.out-of-date diff --git a/plugins/imagem8/imagem8.vcproj b/plugins/imagem8/imagem8.vcproj.out-of-date similarity index 100% rename from plugins/imagem8/imagem8.vcproj rename to plugins/imagem8/imagem8.vcproj.out-of-date diff --git a/plugins/imagepng/imagepng.vcproj b/plugins/imagepng/imagepng.vcproj index 9bf79b88..58a1412c 100644 --- a/plugins/imagepng/imagepng.vcproj +++ b/plugins/imagepng/imagepng.vcproj @@ -1,67 +1,185 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - - \ No newline at end of file + diff --git a/plugins/imagepng/imagepng_VC9.vcproj b/plugins/imagepng/imagepng_VC9.vcproj deleted file mode 100755 index 25419289..00000000 --- a/plugins/imagepng/imagepng_VC9.vcproj +++ /dev/null @@ -1,205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/imagepng/plugin.cpp b/plugins/imagepng/plugin.cpp index 5d8bba70..72f2d43d 100644 --- a/plugins/imagepng/plugin.cpp +++ b/plugins/imagepng/plugin.cpp @@ -137,7 +137,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig // http://www.libpng.org/pub/png/libpng-manual.html png_structp png_ptr = png_create_read_struct - (PNG_LIBPNG_VER_STRING, png_voidp_NULL, + (PNG_LIBPNG_VER_STRING, NULL, user_error_fn, user_warning_fn); if (!png_ptr) { @@ -148,7 +148,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig png_infop info_ptr = png_create_info_struct(png_ptr); if (!info_ptr) { png_destroy_read_struct(&png_ptr, - png_infopp_NULL, png_infopp_NULL); + NULL, NULL); g_FuncTable.m_pfnSysPrintf ("libpng error: png_create_info_struct (info_ptr)\n"); return; } @@ -156,7 +156,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig png_infop end_info = png_create_info_struct(png_ptr); if (!end_info) { png_destroy_read_struct(&png_ptr, &info_ptr, - png_infopp_NULL); + NULL); g_FuncTable.m_pfnSysPrintf ("libpng error: png_create_info_struct (end_info)\n"); return; } @@ -188,7 +188,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig png_set_palette_to_rgb(png_ptr); if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr); @@ -234,7 +234,7 @@ void LoadImage (const char *filename, unsigned char **pic, int *width, int *heig png_read_end(png_ptr, info_ptr); /* free up the memory structure */ - png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); + png_destroy_read_struct(&png_ptr, &info_ptr, NULL); free(row_pointers); g_FileSystemTable.m_pfnFreeFile (fbuffer); diff --git a/plugins/imagewal/imagewal.vcproj b/plugins/imagewal/imagewal.vcproj.out-of-date similarity index 100% rename from plugins/imagewal/imagewal.vcproj rename to plugins/imagewal/imagewal.vcproj.out-of-date diff --git a/plugins/map/map.vcproj b/plugins/map/map.vcproj index 28907131..799e47a4 100644 --- a/plugins/map/map.vcproj +++ b/plugins/map/map.vcproj @@ -1,85 +1,193 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/plugins/map/map_VC9.vcproj b/plugins/map/map_VC9.vcproj deleted file mode 100755 index 52617f01..00000000 --- a/plugins/map/map_VC9.vcproj +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/mapxml/mapxml.vcproj b/plugins/mapxml/mapxml.vcproj index c62a2a20..a258acfc 100644 --- a/plugins/mapxml/mapxml.vcproj +++ b/plugins/mapxml/mapxml.vcproj @@ -1,85 +1,193 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - + - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/plugins/mapxml/mapxml_VC9.vcproj b/plugins/mapxml/mapxml_VC9.vcproj deleted file mode 100755 index 82e793b1..00000000 --- a/plugins/mapxml/mapxml_VC9.vcproj +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/model/model.vcproj b/plugins/model/model.vcproj index 31e89130..6a41dc1e 100644 --- a/plugins/model/model.vcproj +++ b/plugins/model/model.vcproj @@ -1,99 +1,201 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/plugins/model/model_VC9.vcproj b/plugins/model/model_VC9.vcproj deleted file mode 100755 index 3faf9921..00000000 --- a/plugins/model/model_VC9.vcproj +++ /dev/null @@ -1,269 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/sample/sample.vcproj b/plugins/sample/sample.vcproj.out-of-date similarity index 100% rename from plugins/sample/sample.vcproj rename to plugins/sample/sample.vcproj.out-of-date diff --git a/plugins/shaders/shaders.vcproj b/plugins/shaders/shaders.vcproj index 24df4772..bf43324d 100644 --- a/plugins/shaders/shaders.vcproj +++ b/plugins/shaders/shaders.vcproj @@ -1,71 +1,189 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - - - - - - - - - \ No newline at end of file + diff --git a/plugins/shaders/shaders_VC9.vcproj b/plugins/shaders/shaders_VC9.vcproj deleted file mode 100755 index d8fc96a0..00000000 --- a/plugins/shaders/shaders_VC9.vcproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/spritemodel/spritemodel.vcproj b/plugins/spritemodel/spritemodel.vcproj.out-of-date similarity index 100% rename from plugins/spritemodel/spritemodel.vcproj rename to plugins/spritemodel/spritemodel.vcproj.out-of-date diff --git a/plugins/surface/surface.vcproj b/plugins/surface/surface.vcproj index 4c588cf5..ed3631ec 100644 --- a/plugins/surface/surface.vcproj +++ b/plugins/surface/surface.vcproj @@ -1,73 +1,189 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - - - - - - - - - - - \ No newline at end of file + diff --git a/plugins/surface/surface_VC9.vcproj b/plugins/surface/surface_VC9.vcproj deleted file mode 100755 index 9f10e5aa..00000000 --- a/plugins/surface/surface_VC9.vcproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/surface_heretic2/surface_heretic2.vcproj b/plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date similarity index 100% rename from plugins/surface_heretic2/surface_heretic2.vcproj rename to plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date diff --git a/plugins/surface_quake2/surface_quake2.vcproj b/plugins/surface_quake2/surface_quake2.vcproj.out-of-date similarity index 100% rename from plugins/surface_quake2/surface_quake2.vcproj rename to plugins/surface_quake2/surface_quake2.vcproj.out-of-date diff --git a/plugins/surface_ufoai/surface_ufoai.vcproj b/plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date similarity index 100% rename from plugins/surface_ufoai/surface_ufoai.vcproj rename to plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date diff --git a/plugins/textool/TexTool.vcproj b/plugins/textool/TexTool.vcproj.out-of-date similarity index 100% rename from plugins/textool/TexTool.vcproj rename to plugins/textool/TexTool.vcproj.out-of-date diff --git a/plugins/vfspak/vfspak.vcproj b/plugins/vfspak/vfspak.vcproj.out-of-date similarity index 100% rename from plugins/vfspak/vfspak.vcproj rename to plugins/vfspak/vfspak.vcproj.out-of-date diff --git a/plugins/vfspk3/vfspk3.vcproj b/plugins/vfspk3/vfspk3.vcproj index ba6208c1..79fc9fb6 100644 --- a/plugins/vfspk3/vfspk3.vcproj +++ b/plugins/vfspk3/vfspk3.vcproj @@ -1,75 +1,193 @@ - + + - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - + + - + - + - + - - - - - - - - - - - \ No newline at end of file + diff --git a/plugins/vfspk3/vfspk3_VC9.vcproj b/plugins/vfspk3/vfspk3_VC9.vcproj deleted file mode 100755 index 24b06b9b..00000000 --- a/plugins/vfspk3/vfspk3_VC9.vcproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/vfswad/vfswad.vcproj b/plugins/vfswad/vfswad.vcproj.out-of-date similarity index 100% rename from plugins/vfswad/vfswad.vcproj rename to plugins/vfswad/vfswad.vcproj.out-of-date diff --git a/radiant.sln b/radiant.sln index 4d0ae70c..529feffd 100644 --- a/radiant.sln +++ b/radiant.sln @@ -1,56 +1,68 @@  -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual C++ Express 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "radiant", "radiant\radiant.vcproj", "{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" ProjectSection(ProjectDependencies) = postProject - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - {5DCC8086-830E-42E6-B080-5A287F8FF5DC} = {5DCC8086-830E-42E6-B080-5A287F8FF5DC} - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} + {B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B} {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} - {3886C418-A41E-4AFF-BBD1-8E1E508920C9} = {3886C418-A41E-4AFF-BBD1-8E1E508920C9} - {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3-common", "tools\quake3\common\quake3-common.vcproj", "{B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "synapse", "libs\synapse\synapse.vcproj", "{E13CCFB0-A366-4EF3-A66F-C374B563E4DF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmdlib", "libs\cmdlib\cmdlib.vcproj", "{0B522841-BDCC-493A-BA5C-604AE2CD5756}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddslib", "libs\ddslib\ddslib.vcproj", "{5DCC8086-830E-42E6-B080-5A287F8FF5DC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddslib", "libs\ddslib\ddslib.vcproj", "{DDE81BE7-D457-47F3-9762-A838EFA2672E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "l_net", "libs\l_net\l_net.vcproj", "{3886C418-A41E-4AFF-BBD1-8E1E508920C9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "l_net", "libs\l_net\l_net.vcproj", "{B957BA35-F807-4C84-85A2-C1F9AC56713B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "libs\mathlib\mathlib.vcproj", "{320CF5DE-0DFD-4C3F-B558-5F4098E111C8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "libs\mathlib\mathlib.vcproj", "{14734EBB-B167-48D9-9B93-2277F645925F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5lib", "libs\md5lib\md5lib.vcproj", "{DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5lib", "libs\md5lib\md5lib.vcproj", "{12E69671-B980-4BFF-BC1A-6D9A3C158D16}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel.vcproj", "{444E6FDA-83BD-49F1-89A4-7CF716F742A8}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel.vcproj", "{818BAC3D-0399-4416-930D-0AA28D55F798}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "camera", "contrib\camera\camera.vcproj", "{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}" ProjectSection(ProjectDependencies) = postProject - {6C1116CE-D99E-4629-9E69-A9329335D706} = {6C1116CE-D99E-4629-9E69-A9329335D706} {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + {6C1116CE-D99E-4629-9E69-A9329335D706} = {6C1116CE-D99E-4629-9E69-A9329335D706} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "entity", "plugins\entity\entity.vcproj", "{17DD38AA-4842-45BC-9304-2ADC1A12B4F4}" ProjectSection(ProjectDependencies) = postProject + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "plugins\image\image.vcproj", "{1F9977F6-216F-4AE1-9928-59B72CF31C46}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagepng", "plugins\imagepng\imagepng.vcproj", "{43C01E60-21CC-49F5-8A11-F460BC866A31}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map", "plugins\map\map.vcproj", "{1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapxml", "plugins\mapxml\mapxml.vcproj", "{DDBF170A-42DF-4836-9006-816422E08493}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "model", "plugins\model\model.vcproj", "{83C877DA-17B2-4863-B085-06AE9A8D68F3}" ProjectSection(ProjectDependencies) = postProject - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} - {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8} + {818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798} {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders", "plugins\shaders\shaders.vcproj", "{AEBCB950-AB67-48BB-9AF5-FCFB042824E8}" @@ -68,12 +80,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfspk3", "plugins\vfspk3\vf {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "libs\splines\Splines.vcproj", "{6C1116CE-D99E-4629-9E69-A9329335D706}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "splines", "libs\splines\splines.vcproj", "{6C1116CE-D99E-4629-9E69-A9329335D706}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{F5D0509C-80E0-49B7-B033-885D8253063A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{CD40B764-1D47-4FAE-8C6A-EF036E478D65}" ProjectSection(ProjectDependencies) = postProject - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} - {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8} + {12E69671-B980-4BFF-BC1A-6D9A3C158D16} = {12E69671-B980-4BFF-BC1A-6D9A3C158D16} + {818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798} + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} + {B957BA35-F807-4C84-85A2-C1F9AC56713B} = {B957BA35-F807-4C84-85A2-C1F9AC56713B} + {DDE81BE7-D457-47F3-9762-A838EFA2672E} = {DDE81BE7-D457-47F3-9762-A838EFA2672E} + {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} = {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} EndProjectSection EndProject Global @@ -86,6 +102,10 @@ Global {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Debug|Win32.Build.0 = Debug|Win32 {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Release|Win32.ActiveCfg = Release|Win32 {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Release|Win32.Build.0 = Release|Win32 + {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}.Debug|Win32.ActiveCfg = Debug|Win32 + {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}.Debug|Win32.Build.0 = Debug|Win32 + {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}.Release|Win32.ActiveCfg = Release|Win32 + {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06}.Release|Win32.Build.0 = Release|Win32 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|Win32.ActiveCfg = Debug|Win32 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|Win32.Build.0 = Debug|Win32 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Release|Win32.ActiveCfg = Release|Win32 @@ -94,26 +114,26 @@ Global {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Debug|Win32.Build.0 = Debug|Win32 {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Release|Win32.ActiveCfg = Release|Win32 {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Release|Win32.Build.0 = Release|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Debug|Win32.ActiveCfg = Debug|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Debug|Win32.Build.0 = Debug|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Release|Win32.ActiveCfg = Release|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Release|Win32.Build.0 = Release|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Debug|Win32.Build.0 = Debug|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Release|Win32.ActiveCfg = Release|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Release|Win32.Build.0 = Release|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Debug|Win32.ActiveCfg = Debug|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Debug|Win32.Build.0 = Debug|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Release|Win32.ActiveCfg = Release|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Release|Win32.Build.0 = Release|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Debug|Win32.ActiveCfg = Debug|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Debug|Win32.Build.0 = Debug|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Release|Win32.ActiveCfg = Release|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Release|Win32.Build.0 = Release|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Debug|Win32.Build.0 = Debug|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Release|Win32.ActiveCfg = Release|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Release|Win32.Build.0 = Release|Win32 + {DDE81BE7-D457-47F3-9762-A838EFA2672E}.Debug|Win32.ActiveCfg = Debug|Win32 + {DDE81BE7-D457-47F3-9762-A838EFA2672E}.Debug|Win32.Build.0 = Debug|Win32 + {DDE81BE7-D457-47F3-9762-A838EFA2672E}.Release|Win32.ActiveCfg = Release|Win32 + {DDE81BE7-D457-47F3-9762-A838EFA2672E}.Release|Win32.Build.0 = Release|Win32 + {B957BA35-F807-4C84-85A2-C1F9AC56713B}.Debug|Win32.ActiveCfg = Debug|Win32 + {B957BA35-F807-4C84-85A2-C1F9AC56713B}.Debug|Win32.Build.0 = Debug|Win32 + {B957BA35-F807-4C84-85A2-C1F9AC56713B}.Release|Win32.ActiveCfg = Release|Win32 + {B957BA35-F807-4C84-85A2-C1F9AC56713B}.Release|Win32.Build.0 = Release|Win32 + {14734EBB-B167-48D9-9B93-2277F645925F}.Debug|Win32.ActiveCfg = Debug|Win32 + {14734EBB-B167-48D9-9B93-2277F645925F}.Debug|Win32.Build.0 = Debug|Win32 + {14734EBB-B167-48D9-9B93-2277F645925F}.Release|Win32.ActiveCfg = Release|Win32 + {14734EBB-B167-48D9-9B93-2277F645925F}.Release|Win32.Build.0 = Release|Win32 + {12E69671-B980-4BFF-BC1A-6D9A3C158D16}.Debug|Win32.ActiveCfg = Debug|Win32 + {12E69671-B980-4BFF-BC1A-6D9A3C158D16}.Debug|Win32.Build.0 = Debug|Win32 + {12E69671-B980-4BFF-BC1A-6D9A3C158D16}.Release|Win32.ActiveCfg = Release|Win32 + {12E69671-B980-4BFF-BC1A-6D9A3C158D16}.Release|Win32.Build.0 = Release|Win32 + {818BAC3D-0399-4416-930D-0AA28D55F798}.Debug|Win32.ActiveCfg = Debug|Win32 + {818BAC3D-0399-4416-930D-0AA28D55F798}.Debug|Win32.Build.0 = Debug|Win32 + {818BAC3D-0399-4416-930D-0AA28D55F798}.Release|Win32.ActiveCfg = Release|Win32 + {818BAC3D-0399-4416-930D-0AA28D55F798}.Release|Win32.Build.0 = Release|Win32 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|Win32.ActiveCfg = Debug|Win32 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|Win32.Build.0 = Debug|Win32 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Release|Win32.ActiveCfg = Release|Win32 @@ -158,10 +178,10 @@ Global {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.Build.0 = Debug|Win32 {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.ActiveCfg = Release|Win32 {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.Build.0 = Release|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Debug|Win32.ActiveCfg = Debug|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Debug|Win32.Build.0 = Debug|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Release|Win32.ActiveCfg = Release|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Release|Win32.Build.0 = Release|Win32 + {CD40B764-1D47-4FAE-8C6A-EF036E478D65}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD40B764-1D47-4FAE-8C6A-EF036E478D65}.Debug|Win32.Build.0 = Debug|Win32 + {CD40B764-1D47-4FAE-8C6A-EF036E478D65}.Release|Win32.ActiveCfg = Release|Win32 + {CD40B764-1D47-4FAE-8C6A-EF036E478D65}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index 44f8bfbf..3ac20c26 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -39,13 +39,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "missing.h" #include "gtkmisc.h" -#ifdef _WIN32 - // sanity check - some gtk2 win32 runtimes replace sprintf - #if defined( sprintf ) - #error sprintf is a macro. are you sure? - #endif -#endif - #ifdef _WIN32 #include #define X_OK 0 diff --git a/radiant/radiant.vcproj b/radiant/radiant.vcproj index 1b4e3554..8584ff80 100644 --- a/radiant/radiant.vcproj +++ b/radiant/radiant.vcproj @@ -1,10 +1,11 @@ - + - @@ -95,8 +93,6 @@ OutputDirectory="$(SolutionDir)\install" IntermediateDirectory="$(SolutionDir)\build\intermediate\$(ConfigurationName)\$(ProjectName)" ConfigurationType="1" - CharacterSet="2" - WholeProgramOptimization="1" > - @@ -171,1115 +165,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/radiant/radiant_VC9.vcproj b/radiant/radiant_VC9.vcproj deleted file mode 100755 index 9f8c8cfb..00000000 --- a/radiant/radiant_VC9.vcproj +++ /dev/null @@ -1,2459 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/radiant_VC9.sln b/radiant_VC9.sln deleted file mode 100644 index a5e36c56..00000000 --- a/radiant_VC9.sln +++ /dev/null @@ -1,169 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "radiant", "radiant\radiant_VC9.vcproj", "{65D02375-63EE-4A8A-9F8E-504B1D5A1D02}" - ProjectSection(ProjectDependencies) = postProject - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - {5DCC8086-830E-42E6-B080-5A287F8FF5DC} = {5DCC8086-830E-42E6-B080-5A287F8FF5DC} - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} - {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} - {3886C418-A41E-4AFF-BBD1-8E1E508920C9} = {3886C418-A41E-4AFF-BBD1-8E1E508920C9} - {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "synapse", "libs\synapse\synapse_VC9.vcproj", "{E13CCFB0-A366-4EF3-A66F-C374B563E4DF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmdlib", "libs\cmdlib\cmdlib_VC9.vcproj", "{0B522841-BDCC-493A-BA5C-604AE2CD5756}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ddslib", "libs\ddslib\ddslib_VC9.vcproj", "{5DCC8086-830E-42E6-B080-5A287F8FF5DC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "l_net", "libs\l_net\l_net_VC9.vcproj", "{3886C418-A41E-4AFF-BBD1-8E1E508920C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mathlib", "libs\mathlib\mathlib_VC9.vcproj", "{320CF5DE-0DFD-4C3F-B558-5F4098E111C8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5lib", "libs\md5lib\md5lib_VC9.vcproj", "{DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel_VC9.vcproj", "{444E6FDA-83BD-49F1-89A4-7CF716F742A8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "camera", "contrib\camera\camera_VC9.vcproj", "{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}" - ProjectSection(ProjectDependencies) = postProject - {6C1116CE-D99E-4629-9E69-A9329335D706} = {6C1116CE-D99E-4629-9E69-A9329335D706} - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "entity", "plugins\entity\entity_VC9.vcproj", "{17DD38AA-4842-45BC-9304-2ADC1A12B4F4}" - ProjectSection(ProjectDependencies) = postProject - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "plugins\image\image_VC9.vcproj", "{1F9977F6-216F-4AE1-9928-59B72CF31C46}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagepng", "plugins\imagepng\imagepng_VC9.vcproj", "{43C01E60-21CC-49F5-8A11-F460BC866A31}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map", "plugins\map\map_VC9.vcproj", "{1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mapxml", "plugins\mapxml\mapxml_VC9.vcproj", "{DDBF170A-42DF-4836-9006-816422E08493}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "model", "plugins\model\model_VC9.vcproj", "{83C877DA-17B2-4863-B085-06AE9A8D68F3}" - ProjectSection(ProjectDependencies) = postProject - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} = {320CF5DE-0DFD-4C3F-B558-5F4098E111C8} - {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8} - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaders", "plugins\shaders\shaders_VC9.vcproj", "{AEBCB950-AB67-48BB-9AF5-FCFB042824E8}" - ProjectSection(ProjectDependencies) = postProject - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface", "plugins\surface\surface_VC9.vcproj", "{6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}" - ProjectSection(ProjectDependencies) = postProject - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfspk3", "plugins\vfspk3\vfspk3_VC9.vcproj", "{DEFCF433-3A47-40EB-BBF7-861211C3A941}" - ProjectSection(ProjectDependencies) = postProject - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "libs\splines\Splines_VC9.vcproj", "{6C1116CE-D99E-4629-9E69-A9329335D706}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2_VC9.vcproj", "{F5D0509C-80E0-49B7-B033-885D8253063A}" - ProjectSection(ProjectDependencies) = postProject - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} - {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Debug|Win32.ActiveCfg = Debug|Win32 - {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Debug|Win32.Build.0 = Debug|Win32 - {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Release|Win32.ActiveCfg = Release|Win32 - {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Release|Win32.Build.0 = Release|Win32 - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|Win32.ActiveCfg = Debug|Win32 - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|Win32.Build.0 = Debug|Win32 - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Release|Win32.ActiveCfg = Release|Win32 - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Release|Win32.Build.0 = Release|Win32 - {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Debug|Win32.ActiveCfg = Debug|Win32 - {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Debug|Win32.Build.0 = Debug|Win32 - {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Release|Win32.ActiveCfg = Release|Win32 - {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Release|Win32.Build.0 = Release|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Debug|Win32.ActiveCfg = Debug|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Debug|Win32.Build.0 = Debug|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Release|Win32.ActiveCfg = Release|Win32 - {5DCC8086-830E-42E6-B080-5A287F8FF5DC}.Release|Win32.Build.0 = Release|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Debug|Win32.Build.0 = Debug|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Release|Win32.ActiveCfg = Release|Win32 - {3886C418-A41E-4AFF-BBD1-8E1E508920C9}.Release|Win32.Build.0 = Release|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Debug|Win32.ActiveCfg = Debug|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Debug|Win32.Build.0 = Debug|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Release|Win32.ActiveCfg = Release|Win32 - {320CF5DE-0DFD-4C3F-B558-5F4098E111C8}.Release|Win32.Build.0 = Release|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Debug|Win32.ActiveCfg = Debug|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Debug|Win32.Build.0 = Debug|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Release|Win32.ActiveCfg = Release|Win32 - {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}.Release|Win32.Build.0 = Release|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Debug|Win32.Build.0 = Debug|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Release|Win32.ActiveCfg = Release|Win32 - {444E6FDA-83BD-49F1-89A4-7CF716F742A8}.Release|Win32.Build.0 = Release|Win32 - {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|Win32.ActiveCfg = Debug|Win32 - {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|Win32.Build.0 = Debug|Win32 - {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Release|Win32.ActiveCfg = Release|Win32 - {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Release|Win32.Build.0 = Release|Win32 - {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Debug|Win32.ActiveCfg = Debug|Win32 - {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Debug|Win32.Build.0 = Debug|Win32 - {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Release|Win32.ActiveCfg = Release|Win32 - {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Release|Win32.Build.0 = Release|Win32 - {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Debug|Win32.Build.0 = Debug|Win32 - {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Release|Win32.ActiveCfg = Release|Win32 - {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Release|Win32.Build.0 = Release|Win32 - {43C01E60-21CC-49F5-8A11-F460BC866A31}.Debug|Win32.ActiveCfg = Debug|Win32 - {43C01E60-21CC-49F5-8A11-F460BC866A31}.Debug|Win32.Build.0 = Debug|Win32 - {43C01E60-21CC-49F5-8A11-F460BC866A31}.Release|Win32.ActiveCfg = Release|Win32 - {43C01E60-21CC-49F5-8A11-F460BC866A31}.Release|Win32.Build.0 = Release|Win32 - {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Debug|Win32.ActiveCfg = Debug|Win32 - {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Debug|Win32.Build.0 = Debug|Win32 - {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Release|Win32.ActiveCfg = Release|Win32 - {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Release|Win32.Build.0 = Release|Win32 - {DDBF170A-42DF-4836-9006-816422E08493}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDBF170A-42DF-4836-9006-816422E08493}.Debug|Win32.Build.0 = Debug|Win32 - {DDBF170A-42DF-4836-9006-816422E08493}.Release|Win32.ActiveCfg = Release|Win32 - {DDBF170A-42DF-4836-9006-816422E08493}.Release|Win32.Build.0 = Release|Win32 - {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Debug|Win32.Build.0 = Debug|Win32 - {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Release|Win32.ActiveCfg = Release|Win32 - {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Release|Win32.Build.0 = Release|Win32 - {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Debug|Win32.ActiveCfg = Debug|Win32 - {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Debug|Win32.Build.0 = Debug|Win32 - {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Release|Win32.ActiveCfg = Release|Win32 - {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Release|Win32.Build.0 = Release|Win32 - {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Debug|Win32.ActiveCfg = Debug|Win32 - {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Debug|Win32.Build.0 = Debug|Win32 - {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Release|Win32.ActiveCfg = Release|Win32 - {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Release|Win32.Build.0 = Release|Win32 - {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|Win32.ActiveCfg = Debug|Win32 - {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|Win32.Build.0 = Debug|Win32 - {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.ActiveCfg = Release|Win32 - {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.Build.0 = Release|Win32 - {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.ActiveCfg = Debug|Win32 - {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.Build.0 = Debug|Win32 - {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.ActiveCfg = Release|Win32 - {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.Build.0 = Release|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Debug|Win32.ActiveCfg = Debug|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Debug|Win32.Build.0 = Debug|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Release|Win32.ActiveCfg = Release|Win32 - {F5D0509C-80E0-49B7-B033-885D8253063A}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tools/quake2/q2map/q2map.vcproj b/tools/quake2/q2map/q2map.vcproj.out-of-date similarity index 100% rename from tools/quake2/q2map/q2map.vcproj rename to tools/quake2/q2map/q2map.vcproj.out-of-date diff --git a/tools/quake2/qdata/qdata3.vcproj b/tools/quake2/qdata/qdata3.vcproj.out-of-date similarity index 100% rename from tools/quake2/qdata/qdata3.vcproj rename to tools/quake2/qdata/qdata3.vcproj.out-of-date diff --git a/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj b/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj.out-of-date similarity index 100% rename from tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj rename to tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj.out-of-date diff --git a/libs/mathlib/mathlib_VC9.vcproj b/tools/quake3/common/quake3-common.vcproj old mode 100755 new mode 100644 similarity index 62% rename from libs/mathlib/mathlib_VC9.vcproj rename to tools/quake3/common/quake3-common.vcproj index 48d0081a..f6179cef --- a/libs/mathlib/mathlib_VC9.vcproj +++ b/tools/quake3/common/quake3-common.vcproj @@ -1,11 +1,11 @@ - + + + + + + + + + - - diff --git a/tools/quake3/q3data/q3data.vcproj b/tools/quake3/q3data/q3data.vcproj.out-of-date similarity index 100% rename from tools/quake3/q3data/q3data.vcproj rename to tools/quake3/q3data/q3data.vcproj.out-of-date diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index bdd6033a..78b2f7c1 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -81,9 +81,6 @@ dependencies #include "vfs.h" #include "png.h" -/* mhash library must be installed locally or system wide - http://mhash.sourceforge.net/ */ -//#include "mhash.h" - #include diff --git a/tools/quake3/q3map2/q3map2.vcproj b/tools/quake3/q3map2/q3map2.vcproj index 182f50c1..dbedde29 100644 --- a/tools/quake3/q3map2/q3map2.vcproj +++ b/tools/quake3/q3map2/q3map2.vcproj @@ -1,10 +1,11 @@ - + - - @@ -179,7 +166,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.39.2