diff --git a/config.py b/config.py
index 43269aef..10d3ed7e 100644
--- a/config.py
+++ b/config.py
@@ -286,7 +286,7 @@ class Config:
'gtk-bundle-2.24.10-GtkRadiant.zip',
'gtk-bundle-2.22.1-win64-GtkRadiant.zip',
'jpeg-9-MSVC2014-GtkRadiant.zip',
- 'libxml2-2.9.2-GtkRadiant.zip',
+ 'libxml2-2.9.2-GtkRadiant-2.zip',
'gtkglext-1.2.0-3-win32.zip',
]:
if ( not os.path.exists( lib_archive ) ):
@@ -366,6 +366,18 @@ class Config:
]:
shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' )
+ self.CloneBSPC()
+
+ def CloneBSPC( self ):
+ if ( os.path.exists( 'bspc' ) ):
+ cmd = [ 'git', 'pull' ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd, cwd = 'bspc' )
+ else:
+ cmd = [ 'git', 'clone', 'https://github.com/TTimo/bspc.git' ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
+
def FinishBuild( self, target, source, env ):
print( 'Lookup and bundle the PNG and JPEG libraries' )
# radiant.bin doesn't link to jpeg lib directly, grab that from a module
@@ -383,6 +395,10 @@ class Config:
jpeg_path = find_library( module_ldd, 'libjpeg' )
print( 'JPEG library: %s' % repr( jpeg_path ) )
+
+ p = subprocess.Popen( 'ldd -r install/modules/imagepng.so', shell = True, stdout = subprocess.PIPE )
+ module_ldd = p.communicate()[0]
+
png_path = find_library( module_ldd, 'libpng' )
print( 'PNG library: %s' % repr( png_path ) )
diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcxproj b/contrib/bkgrnd2d/bkgrnd2d.vcxproj
index 07771396..f703abfc 100644
--- a/contrib/bkgrnd2d/bkgrnd2d.vcxproj
+++ b/contrib/bkgrnd2d/bkgrnd2d.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/contrib/bobtoolz/bobtoolz.vcxproj b/contrib/bobtoolz/bobtoolz.vcxproj
index f13d52e8..39794707 100644
--- a/contrib/bobtoolz/bobtoolz.vcxproj
+++ b/contrib/bobtoolz/bobtoolz.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/contrib/camera/camera.vcxproj b/contrib/camera/camera.vcxproj
index da17b441..a325b801 100644
--- a/contrib/camera/camera.vcxproj
+++ b/contrib/camera/camera.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/contrib/gtkgensurf/gtkgensurf.vcxproj b/contrib/gtkgensurf/gtkgensurf.vcxproj
index 3deb075e..34cddbd2 100644
--- a/contrib/gtkgensurf/gtkgensurf.vcxproj
+++ b/contrib/gtkgensurf/gtkgensurf.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/contrib/hydratoolz/hydratoolz.vcxproj b/contrib/hydratoolz/hydratoolz.vcxproj
index 50edb130..ebbf5ed0 100644
--- a/contrib/hydratoolz/hydratoolz.vcxproj
+++ b/contrib/hydratoolz/hydratoolz.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/contrib/prtview/prtview.vcxproj b/contrib/prtview/prtview.vcxproj
index cdbdc776..a24ab7ad 100644
--- a/contrib/prtview/prtview.vcxproj
+++ b/contrib/prtview/prtview.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/include/stl_check.h b/include/stl_check.h
index 5f5bf042..b08142bd 100644
--- a/include/stl_check.h
+++ b/include/stl_check.h
@@ -24,7 +24,10 @@
this allows to catch some weird errors early at compile time
*/
+// TODO: finish complete cleanup and removal of STLPort usage traces
+#ifndef Q_NO_STLPORT
#define Q_NO_STLPORT
+#endif
#ifdef Q_NO_STLPORT
diff --git a/libs/cmdlib/cmdlib.vcxproj b/libs/cmdlib/cmdlib.vcxproj
index c66325fe..524ed18c 100644
--- a/libs/cmdlib/cmdlib.vcxproj
+++ b/libs/cmdlib/cmdlib.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/libs/ddslib/ddslib.vcxproj b/libs/ddslib/ddslib.vcxproj
index d8801187..cbe39566 100644
--- a/libs/ddslib/ddslib.vcxproj
+++ b/libs/ddslib/ddslib.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/libs/l_net/l_net.vcxproj b/libs/l_net/l_net.vcxproj
index 9c0a8b66..1bae0130 100644
--- a/libs/l_net/l_net.vcxproj
+++ b/libs/l_net/l_net.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/libs/mathlib/mathlib.vcxproj b/libs/mathlib/mathlib.vcxproj
index a5fb91d7..bf18ac62 100644
--- a/libs/mathlib/mathlib.vcxproj
+++ b/libs/mathlib/mathlib.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/libs/md5lib/md5lib.vcxproj b/libs/md5lib/md5lib.vcxproj
index 6419c99b..9206c2ff 100644
--- a/libs/md5lib/md5lib.vcxproj
+++ b/libs/md5lib/md5lib.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/libs/picomodel/picomodel.vcxproj b/libs/picomodel/picomodel.vcxproj
index a1b8394e..78725e7c 100644
--- a/libs/picomodel/picomodel.vcxproj
+++ b/libs/picomodel/picomodel.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/libs/splines/splines.vcxproj b/libs/splines/splines.vcxproj
index cf90a3f2..3460017c 100644
--- a/libs/splines/splines.vcxproj
+++ b/libs/splines/splines.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/libs/synapse/synapse.vcxproj b/libs/synapse/synapse.vcxproj
index f958a265..6e0e6a16 100644
--- a/libs/synapse/synapse.vcxproj
+++ b/libs/synapse/synapse.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/plugins/eclassfgd/fgd.vcxproj b/plugins/eclassfgd/fgd.vcxproj
index 6beda990..f89905cf 100644
--- a/plugins/eclassfgd/fgd.vcxproj
+++ b/plugins/eclassfgd/fgd.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/entity/entity.vcxproj b/plugins/entity/entity.vcxproj
index bb9dc617..7539ca9d 100644
--- a/plugins/entity/entity.vcxproj
+++ b/plugins/entity/entity.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/image/image.vcxproj b/plugins/image/image.vcxproj
index 579c8149..e667e75e 100644
--- a/plugins/image/image.vcxproj
+++ b/plugins/image/image.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/imagehl/imagehl.vcxproj b/plugins/imagehl/imagehl.vcxproj
index 01d2f9d1..80f3264d 100644
--- a/plugins/imagehl/imagehl.vcxproj
+++ b/plugins/imagehl/imagehl.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/imagem8/imagem8.vcxproj b/plugins/imagem8/imagem8.vcxproj
index 692755eb..2d804164 100644
--- a/plugins/imagem8/imagem8.vcxproj
+++ b/plugins/imagem8/imagem8.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/imagepng/imagepng.vcxproj b/plugins/imagepng/imagepng.vcxproj
index e00cdade..e1338b65 100644
--- a/plugins/imagepng/imagepng.vcxproj
+++ b/plugins/imagepng/imagepng.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/imagewal/imagewal.vcxproj b/plugins/imagewal/imagewal.vcxproj
index b959384d..cbba0c7d 100644
--- a/plugins/imagewal/imagewal.vcxproj
+++ b/plugins/imagewal/imagewal.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/map/map.vcxproj b/plugins/map/map.vcxproj
index 7883dd3f..3e0c3757 100644
--- a/plugins/map/map.vcxproj
+++ b/plugins/map/map.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/mapxml/mapxml.vcxproj b/plugins/mapxml/mapxml.vcxproj
index 14887615..dc6a5e22 100644
--- a/plugins/mapxml/mapxml.vcxproj
+++ b/plugins/mapxml/mapxml.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/model/model.vcxproj b/plugins/model/model.vcxproj
index 0ab805ec..362e5a36 100644
--- a/plugins/model/model.vcxproj
+++ b/plugins/model/model.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/shaders/shaders.vcxproj b/plugins/shaders/shaders.vcxproj
index 701d1697..4e2e5b86 100644
--- a/plugins/shaders/shaders.vcxproj
+++ b/plugins/shaders/shaders.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/spritemodel/spritemodel.vcxproj b/plugins/spritemodel/spritemodel.vcxproj
index 1e28a60f..83475552 100644
--- a/plugins/spritemodel/spritemodel.vcxproj
+++ b/plugins/spritemodel/spritemodel.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/surface/surface.vcxproj b/plugins/surface/surface.vcxproj
index fbc6a6f2..6b6929d1 100644
--- a/plugins/surface/surface.vcxproj
+++ b/plugins/surface/surface.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/surface_idtech2/surface_idtech2.vcxproj b/plugins/surface_idtech2/surface_idtech2.vcxproj
index a0d48a7a..967ab223 100644
--- a/plugins/surface_idtech2/surface_idtech2.vcxproj
+++ b/plugins/surface_idtech2/surface_idtech2.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/textool/textool.vcxproj b/plugins/textool/textool.vcxproj
index 8737aa0c..398d00f8 100644
--- a/plugins/textool/textool.vcxproj
+++ b/plugins/textool/textool.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/vfspak/vfspak.vcxproj b/plugins/vfspak/vfspak.vcxproj
index d87bf3d3..c8bd74c1 100644
--- a/plugins/vfspak/vfspak.vcxproj
+++ b/plugins/vfspak/vfspak.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/vfspk3/vfspk3.vcxproj b/plugins/vfspk3/vfspk3.vcxproj
index 2195a14a..f12e1f30 100644
--- a/plugins/vfspk3/vfspk3.vcxproj
+++ b/plugins/vfspk3/vfspk3.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/vfsqlpk3/vfsqlpk3.vcxproj b/plugins/vfsqlpk3/vfsqlpk3.vcxproj
index 842372a1..f5741e26 100644
--- a/plugins/vfsqlpk3/vfsqlpk3.vcxproj
+++ b/plugins/vfsqlpk3/vfsqlpk3.vcxproj
@@ -31,7 +31,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/plugins/vfswad/vfswad.vcxproj b/plugins/vfswad/vfswad.vcxproj
index 7e7a2d0f..3da486c2 100644
--- a/plugins/vfswad/vfswad.vcxproj
+++ b/plugins/vfswad/vfswad.vcxproj
@@ -30,7 +30,7 @@
DynamicLibrary
- v110_xp
+ v140
DynamicLibrary
diff --git a/radiant/filters.cpp b/radiant/filters.cpp
index 7a59b0e4..f9669cff 100644
--- a/radiant/filters.cpp
+++ b/radiant/filters.cpp
@@ -139,10 +139,7 @@ bfilter_t *FilterAddBase( bfilter_t *pFilter ){
pFilter = FilterAddImpl( pFilter,1,0,"areaportal",EXCLUDE_AREAPORTALS,true );
pFilter = FilterAddImpl( pFilter,2,QER_TRANS,NULL,EXCLUDE_TRANSLUCENT,true );
pFilter = FilterAddImpl( pFilter,3,0,"trigger",EXCLUDE_TRIGGERS,true );
- pFilter = FilterAddImpl( pFilter,3,0,"misc_model",EXCLUDE_MODELS,true );
- pFilter = FilterAddImpl( pFilter,3,0,"misc_gamemodel",EXCLUDE_MODELS,true );
- pFilter = FilterAddImpl( pFilter,3,0,"misc_model_static",EXCLUDE_MODELS,true );
- pFilter = FilterAddImpl( pFilter,3,0,"model_static",EXCLUDE_MODELS,true );
+ pFilter = FilterAddImpl( pFilter,4,ECLASS_MISCMODEL,NULL,EXCLUDE_MODELS,true );
pFilter = FilterAddImpl( pFilter,4,ECLASS_LIGHT,NULL,EXCLUDE_LIGHTS,true );
pFilter = FilterAddImpl( pFilter,4,ECLASS_PATH,NULL,EXCLUDE_PATHS,true );
pFilter = FilterAddImpl( pFilter,1,0,"lightgrid",EXCLUDE_LIGHTGRID,true );
diff --git a/radiant/radiant.vcxproj b/radiant/radiant.vcxproj
index 1dc2cb81..ffb03471 100644
--- a/radiant/radiant.vcxproj
+++ b/radiant/radiant.vcxproj
@@ -30,7 +30,7 @@
Application
- v110_xp
+ v140
Application
diff --git a/tools/quake3/common/quake3-common.vcxproj b/tools/quake3/common/quake3-common.vcxproj
index 6953185e..72acb722 100644
--- a/tools/quake3/common/quake3-common.vcxproj
+++ b/tools/quake3/common/quake3-common.vcxproj
@@ -30,7 +30,7 @@
StaticLibrary
- v110_xp
+ v140
StaticLibrary
diff --git a/tools/quake3/q3data/q3data.vcxproj b/tools/quake3/q3data/q3data.vcxproj
index 913c4c4c..a68b6eb7 100644
--- a/tools/quake3/q3data/q3data.vcxproj
+++ b/tools/quake3/q3data/q3data.vcxproj
@@ -32,7 +32,7 @@
Application
- v110_xp
+ v140
MultiByte
true
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 0da3f836..6a6a15e8 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -335,7 +335,11 @@ extern int unz_GAME_QL;
#define MAX_MAP_PORTALS 0x20000
#define MAX_MAP_LIGHTING 0x800000
#define MAX_MAP_LIGHTGRID 0x100000 //% 0x800000 /* ydnar: set to points, not bytes */
-#define MAX_MAP_VISIBILITY 0x200000
+
+// some recent QL maps have started hitting the limit (old value was 0x200000). QBall
+// below has been 'borrowed' from the netradiant fork
+#define MAX_MAP_VISCLUSTERS 0x4000 // <= MAX_MAP_LEAFS
+#define MAX_MAP_VISIBILITY ( VIS_HEADER_SIZE + MAX_MAP_VISCLUSTERS * ( ( ( MAX_MAP_VISCLUSTERS + 63 ) & ~63 ) >> 3 ) )
#define MAX_MAP_DRAW_SURFS 0x20000
#define MAX_MAP_DRAW_VERTS 0x100000
diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj
index 30b2c33a..a408eed6 100644
--- a/tools/quake3/q3map2/q3map2.vcxproj
+++ b/tools/quake3/q3map2/q3map2.vcxproj
@@ -30,7 +30,7 @@
Application
- v110_xp
+ v140
Application
@@ -113,7 +113,7 @@
/STACK:8388608 %(AdditionalOptions)
Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies)
- $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories)
+ $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc/x64;$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories)
true
Console
@@ -153,7 +153,7 @@
/STACK:8388608 %(AdditionalOptions)
Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2_a.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies)
- $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories)
+ $(SolutionDir)\..\gtk-2.22.1_win64\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc/x64;$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories)
true
Console
true
diff --git a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj
index 6e822f28..5fb0ef29 100644
--- a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj
+++ b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj
@@ -44,7 +44,7 @@
Application
- v110_xp
+ v140
false
MultiByte