From: rambetter Date: Tue, 22 Feb 2011 04:48:05 +0000 (+0000) Subject: Fixing Linux SCons build. X-Git-Tag: xonotic-v0.7.0~16^2~12^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48410b113dd2036e69dbf723a39ec9af02fc9b12;p=xonotic%2Fnetradiant.git Fixing Linux SCons build. Fixing plugins on both Linux and Windows. It's consistent now. Fixing gl font on Windows. Mostly, added lots of plugins. git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@474 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- diff --git a/SConscript.module b/SConscript.module index a7f25497..9de19471 100644 --- a/SConscript.module +++ b/SConscript.module @@ -11,39 +11,43 @@ Import( [ 'utils', 'config', 'settings', 'project', 'shlib_objects' ] ) libname = os.path.splitext( libname )[0] env = Environment() -useJPEG = False -useGtk = False -useZ = False -usePNG = False -if ( libname == 'image' ): - useJPEG = True -if ( libname == 'surface' ): - useGtk = True -if ( libname == 'surface_ufoai' ): - useGtk = True -if ( libname == 'surface_quake2' ): - useGtk = True -if ( libname == 'surface_heretic2' ): - useGtk = True -if ( libname == 'bkgrnd2d' ): - useGtk = True -if ( libname == 'gtkgensurf' ): - useGtk = True -if ( libname == 'bobToolz_gtk' ): - useGtk = True -if ( libname == 'camera' ): - useGtk = True -if ( libname == 'PrtView' ): - useGtk = True -if ( libname == 'spritemodel' ): - useGtk = True -if ( libname == 'model' ): - useGtk = True -if ( libname == 'TexTool' ): - useGtk = True -if ( libname == 'imagepng' ): - usePNG = True +# useJPEG = False +# useGtk = False +# useZ = False +# usePNG = False +# if ( libname == 'image' ): +# useJPEG = True +# if ( libname == 'surface' ): +# useGtk = True +# if ( libname == 'surface_ufoai' ): +# useGtk = True +# if ( libname == 'surface_quake2' ): +# useGtk = True +# if ( libname == 'surface_heretic2' ): +# useGtk = True +# if ( libname == 'bkgrnd2d' ): +# useGtk = True +# if ( libname == 'gtkgensurf' ): +# useGtk = True +# if ( libname == 'bobtoolz' ): +# useGtk = True +# if ( libname == 'camera' ): +# useGtk = True +# if ( libname == 'prtview' ): +# useGtk = True +# if ( libname == 'spritemodel' ): +# useGtk = True +# if ( libname == 'model' ): +# useGtk = True +# if ( libname == 'textool' ): +# useGtk = True +# if ( libname == 'imagepng' ): +# usePNG = True +useJPEG = True +useGtk = True +useZ = True +usePNG = True settings.SetupEnvironment( env, config['name'], useGtk = useGtk, useJPEG = useJPEG, useZ = useZ, usePNG = usePNG ) proj = utils.vcproj( os.path.join( GetLaunchDir(), project ) ) diff --git a/config.py b/config.py index 2134b07f..07b6483e 100644 --- a/config.py +++ b/config.py @@ -77,9 +77,8 @@ class Config: Export( 'utils', 'settings', 'config' ) build_dir = os.path.join( 'build', config_name, 'radiant' ) BuildDir( build_dir, '.', duplicate = 0 ) - # left out jpeg6, splines (FIXME: I think jpeg6 is not used at all, can trash?) lib_objects = [] - for project in [ 'libs/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]: + for project in [ 'libs/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj' ]: Export( 'project' ) lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) Export( 'lib_objects' ) @@ -88,7 +87,7 @@ class Config: # PIC versions of the libs for the modules shlib_objects_extra = {} - for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj' ]: + for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/splines/splines.vcproj' ]: ( libpath, libname ) = os.path.split( project ) libname = os.path.splitext( libname )[0] config['shared'] = True @@ -108,8 +107,7 @@ class Config: 'plugins/imagewal/imagewal.vcproj', 'plugins/imagem8/imagem8.vcproj', 'plugins/spritemodel/spritemodel.vcproj', - 'plugins/textool/TexTool.vcproj', - # 'plugins/sample/sample.vcproj', + 'plugins/textool/textool.vcproj', 'plugins/map/map.vcproj', 'plugins/mapxml/mapxml.vcproj', 'plugins/shaders/shaders.vcproj', @@ -117,32 +115,35 @@ class Config: 'plugins/surface_ufoai/surface_ufoai.vcproj', 'plugins/surface_quake2/surface_quake2.vcproj', 'plugins/surface_heretic2/surface_heretic2.vcproj', - # FIXME Needs splines - # 'contrib/camera/camera.vcproj', - - # FIXME What is this? Empty dir for me - remove me? - # 'contrib/patches/patches.vcproj', - # 'plugins/archivewad/archivewad.vcproj', - - 'contrib/prtview/PrtView.vcproj', + 'contrib/camera/camera.vcproj', + 'contrib/prtview/prtview.vcproj', 'contrib/hydratoolz/hydratoolz.vcproj', - 'contrib/bobtoolz/bobToolz_gtk.vcproj', + 'contrib/bobtoolz/bobtoolz.vcproj', 'contrib/gtkgensurf/gtkgensurf.vcproj', 'contrib/ufoai/ufoai.vcproj', 'contrib/bkgrnd2d/bkgrnd2d.vcproj' ]: ( libpath, libname ) = os.path.split( project ) libname = os.path.splitext( libname )[0] - shlib_objects = shlib_objects_extra['synapse'] - if ( libname == 'entity' ): + # The old code assigned shlib_objects to shlib_objects_extra['synapse'], + # and this resulted in a non-copy. Stuff is added to shlib_objects below. + # So we need the explicit copy so we don't modify shlib_objects_extra['synapse']. + shlib_objects = shlib_objects_extra['synapse'][:] + if ( libname == 'camera' ): + shlib_objects += shlib_objects_extra['splines'] + elif ( libname == 'entity' ): shlib_objects += shlib_objects_extra['mathlib'] + elif ( libname == 'map' ): + shlib_objects += shlib_objects_extra['cmdlib'] elif ( libname == 'model' ): shlib_objects += shlib_objects_extra['picomodel'] -# elif ( libname == 'spritemodel' ): -# shlib_objects += shlib_objects_extra['mathlib'] -# elif ( libname == 'TexTool' ): -# shlib_objects += shlib_objects_extra['mathlib'] - elif ( libname == 'map' ): + shlib_objects += shlib_objects_extra['mathlib'] + elif ( libname == 'spritemodel' ): + shlib_objects += shlib_objects_extra['mathlib'] + elif ( libname == 'textool' ): + shlib_objects += shlib_objects_extra['mathlib'] + elif ( libname == 'bobtoolz' ): + shlib_objects += shlib_objects_extra['mathlib'] shlib_objects += shlib_objects_extra['cmdlib'] Export( 'project', 'shlib_objects' ) module = SConscript( os.path.join( build_dir, 'SConscript.module' ) ) @@ -158,7 +159,7 @@ class Config: build_dir = os.path.join( 'build', config_name, 'q3map2' ) BuildDir( build_dir, '.', duplicate = 0 ) lib_objects = [] - for project in [ 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib_VC9.vcproj' ]: + for project in [ 'tools/quake3/common/quake3-common.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]: Export( 'project' ) lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) Export( 'lib_objects' ) @@ -275,7 +276,7 @@ class Config: if ( self.platform == 'Windows' ): backup_cwd = os.getcwd() for lib_archive in [ - 'gtk+-bundle-2.16.6-20100912-2-win32.zip', + 'gtk+-bundle-2.16.6-20100912-3-win32.zip', 'gtkglext-1.2.0-3-win32.zip', 'libxml2-2.7.3-2-win32.zip', 'jpeg-8c-4-win32.zip', diff --git a/contrib/bkgrnd2d/bkgrnd2d.def b/contrib/bkgrnd2d/bkgrnd2d.def index fa90fdb1..30f9b0b3 100644 --- a/contrib/bkgrnd2d/bkgrnd2d.def +++ b/contrib/bkgrnd2d/bkgrnd2d.def @@ -1,7 +1,6 @@ ; bkgrnd2d.def : Declares the module parameters for the DLL. LIBRARY "BKGRND2D" -DESCRIPTION 'BKGRND2D Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj b/contrib/bkgrnd2d/bkgrnd2d.vcproj new file mode 100644 index 00000000..07a8a14c --- /dev/null +++ b/contrib/bkgrnd2d/bkgrnd2d.vcproj @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date b/contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date deleted file mode 100644 index 8453d9c0..00000000 --- a/contrib/bkgrnd2d/bkgrnd2d.vcproj.out-of-date +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp index 2529bab6..7b8a2137 100644 --- a/contrib/bkgrnd2d/dialog.cpp +++ b/contrib/bkgrnd2d/dialog.cpp @@ -36,6 +36,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // spaces to make label nice and big #define NO_FILE_MSG " (no file loaded) " +#ifdef _WIN32 + // TTimo: THIS IS UGLY +#define snprintf _snprintf +#endif + static GtkWidget *pDialogWnd; static GtkWidget *pNotebook; static GtkTooltips *pTooltips; diff --git a/contrib/bobtoolz/DEntity.cpp b/contrib/bobtoolz/DEntity.cpp index a0c44a89..ca035b83 100644 --- a/contrib/bobtoolz/DEntity.cpp +++ b/contrib/bobtoolz/DEntity.cpp @@ -303,7 +303,7 @@ void DEntity::SelectBrushes(bool *selectList) g_FuncTable.m_pfnAllocateActiveBrushHandles(); - for(std::list::const_iterator pBrush=brushList.begin(); pBrush!=brushList.end(); pBrush++) + for(list::const_iterator pBrush=brushList.begin(); pBrush!=brushList.end(); pBrush++) { if(selectList[(*pBrush)->m_nBrushID]) g_FuncTable.m_pfnSelectBrush((*pBrush)->QER_brush); diff --git a/contrib/bobtoolz/DMap.cpp b/contrib/bobtoolz/DMap.cpp index 0bbaafb8..5d935959 100644 --- a/contrib/bobtoolz/DMap.cpp +++ b/contrib/bobtoolz/DMap.cpp @@ -40,7 +40,7 @@ DMap::~DMap() ClearEntities(); } -DEntity* DMap::AddEntity(const char *classname, int ID) +DEntity* DMap::AddEntity(char *classname, int ID) { DEntity* newEntity; if(ID == -1) diff --git a/contrib/bobtoolz/DMap.h b/contrib/bobtoolz/DMap.h index b63cafd6..60f58543 100644 --- a/contrib/bobtoolz/DMap.h +++ b/contrib/bobtoolz/DMap.h @@ -43,7 +43,7 @@ public: void ClearEntities(); DEntity* DMap::GetEntityForID(int ID); - DEntity* AddEntity(const char* classname = "worldspawn", int ID = -1); + DEntity* AddEntity(char* classname = "worldspawn", int ID = -1); list entityList; diff --git a/contrib/bobtoolz/DVisDrawer.cpp b/contrib/bobtoolz/DVisDrawer.cpp index 318b7bc8..c03a9262 100644 --- a/contrib/bobtoolz/DVisDrawer.cpp +++ b/contrib/bobtoolz/DVisDrawer.cpp @@ -162,7 +162,7 @@ void DVisDrawer::UnRegister() m_bHooked = FALSE; } -void DVisDrawer::SetList(std::list *pointList) +void DVisDrawer::SetList(list *pointList) { if(m_list) ClearPoints(); diff --git a/contrib/bobtoolz/bobToolz.def b/contrib/bobtoolz/bobToolz.def deleted file mode 100644 index c22c76d3..00000000 --- a/contrib/bobtoolz/bobToolz.def +++ /dev/null @@ -1,8 +0,0 @@ -; plugin.def : Declares the module parameters for the DLL. - -LIBRARY "bobToolz" -; DESCRIPTION 'bobToolz Windows Dynamic Link Library' - -EXPORTS - ; Explicit exports can go here - Synapse_EnumerateInterfaces @1 diff --git a/contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date b/contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date deleted file mode 100644 index bcdf2d7a..00000000 --- a/contrib/bobtoolz/bobToolz_gtk.vcproj.out-of-date +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/contrib/bobtoolz/bobtoolz.def b/contrib/bobtoolz/bobtoolz.def new file mode 100644 index 00000000..1ffb72d5 --- /dev/null +++ b/contrib/bobtoolz/bobtoolz.def @@ -0,0 +1,7 @@ +; plugin.def : Declares the module parameters for the DLL. + +LIBRARY "bobToolz" + +EXPORTS + ; Explicit exports can go here + Synapse_EnumerateInterfaces @1 diff --git a/contrib/bobtoolz/bobtoolz.vcproj b/contrib/bobtoolz/bobtoolz.vcproj new file mode 100644 index 00000000..d79a8a33 --- /dev/null +++ b/contrib/bobtoolz/bobtoolz.vcproj @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/bobtoolz/misc.cpp b/contrib/bobtoolz/misc.cpp index a0490b46..b1929f38 100644 --- a/contrib/bobtoolz/misc.cpp +++ b/contrib/bobtoolz/misc.cpp @@ -180,7 +180,7 @@ char* UnixToDosPath(char* path) const char* ExtractFilename(const char* path) { - char* p = strrchr(path, '/'); + const char* p = strrchr(path, '/'); if(!p) { p = strrchr(path, '\\'); diff --git a/contrib/gtkgensurf/bitmap.cpp b/contrib/gtkgensurf/bitmap.cpp index 9955e8d5..bde2595d 100644 --- a/contrib/gtkgensurf/bitmap.cpp +++ b/contrib/gtkgensurf/bitmap.cpp @@ -19,6 +19,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include + +#ifdef _WIN32 +// cough, cough +typedef __int32 int32_t; +typedef unsigned __int16 uint16_t; +typedef unsigned __int8 uint8_t; +typedef unsigned __int32 uint32_t; +typedef __int16 int16_t; +#endif + #include #include "gensurf.h" diff --git a/contrib/gtkgensurf/dec.cpp b/contrib/gtkgensurf/dec.cpp index e651d741..8a61b2f7 100644 --- a/contrib/gtkgensurf/dec.cpp +++ b/contrib/gtkgensurf/dec.cpp @@ -441,7 +441,7 @@ int tricall(int NumNodes, NODE *Node, int *NumTris, TRI **inTri, TRI **Tri, cons out.edgelist = (int *) NULL; /* Needed only if -e switch used. */ out.edgemarkerlist = (int *) NULL; /* Needed if -e used and -B not used. */ - triangulate(Options, &in, &out, NULL); + triangulate((char *) Options, &in, &out, NULL); NumTris[0] = out.numberoftriangles; *Tri = (TRI *) malloc(NumTris[0] * sizeof(TRI)); diff --git a/contrib/gtkgensurf/gendlgs.cpp b/contrib/gtkgensurf/gendlgs.cpp index 01df80b8..a089ed0a 100644 --- a/contrib/gtkgensurf/gendlgs.cpp +++ b/contrib/gtkgensurf/gendlgs.cpp @@ -913,7 +913,7 @@ static void bitmap_browse (GtkWidget *widget, gpointer data) { strcpy (gbmp.name, filename); - ptr = strrchr (filename, G_DIR_SEPARATOR); + ptr = (char *) strrchr (filename, G_DIR_SEPARATOR); if (ptr != NULL) { *(ptr+1) = '\0'; diff --git a/contrib/gtkgensurf/gensurf.def b/contrib/gtkgensurf/gensurf.def deleted file mode 100644 index e3152e85..00000000 --- a/contrib/gtkgensurf/gensurf.def +++ /dev/null @@ -1,8 +0,0 @@ -; gensurf.def : Declares the module parameters for the DLL. - -LIBRARY "gensurf" -DESCRIPTION 'gensurf Windows Dynamic Link Library' - -EXPORTS - ; Explicit exports can go here - Synapse_EnumerateInterfaces @1 diff --git a/contrib/gtkgensurf/gtkgensurf.def b/contrib/gtkgensurf/gtkgensurf.def new file mode 100644 index 00000000..89b38128 --- /dev/null +++ b/contrib/gtkgensurf/gtkgensurf.def @@ -0,0 +1,7 @@ +; gtkgensurf.def : Declares the module parameters for the DLL. + +LIBRARY "gtkgensurf" + +EXPORTS + ; Explicit exports can go here + Synapse_EnumerateInterfaces @1 diff --git a/contrib/gtkgensurf/gtkgensurf.vcproj b/contrib/gtkgensurf/gtkgensurf.vcproj new file mode 100644 index 00000000..58f8b832 --- /dev/null +++ b/contrib/gtkgensurf/gtkgensurf.vcproj @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date b/contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date deleted file mode 100644 index 059d57a1..00000000 --- a/contrib/gtkgensurf/gtkgensurf.vcproj.out-of-date +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/contrib/hydratoolz/hydratoolz.def b/contrib/hydratoolz/hydratoolz.def index c48e519a..99afcb5e 100644 --- a/contrib/hydratoolz/hydratoolz.def +++ b/contrib/hydratoolz/hydratoolz.def @@ -1,7 +1,6 @@ ; fgd.def : Declares the module parameters for the DLL. LIBRARY "HydraToolz" -DESCRIPTION 'HydraToolz Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/contrib/hydratoolz/hydratoolz.vcproj b/contrib/hydratoolz/hydratoolz.vcproj new file mode 100644 index 00000000..b191cc3f --- /dev/null +++ b/contrib/hydratoolz/hydratoolz.vcproj @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/hydratoolz/hydratoolz.vcproj.out-of-date b/contrib/hydratoolz/hydratoolz.vcproj.out-of-date deleted file mode 100644 index f0d5ecbe..00000000 --- a/contrib/hydratoolz/hydratoolz.vcproj.out-of-date +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/contrib/prtview/PrtView.def b/contrib/prtview/PrtView.def deleted file mode 100644 index 24f945d7..00000000 --- a/contrib/prtview/PrtView.def +++ /dev/null @@ -1,8 +0,0 @@ -; PrtView.def : Declares the module parameters for the DLL. - -LIBRARY "PrtView" -; DESCRIPTION 'PrtView Windows Dynamic Link Library' - -EXPORTS - ; Explicit exports can go here - Synapse_EnumerateInterfaces @1 diff --git a/contrib/prtview/PrtView.txt b/contrib/prtview/PrtView.txt index b88e610c..fbadabea 100644 --- a/contrib/prtview/PrtView.txt +++ b/contrib/prtview/PrtView.txt @@ -1,4 +1,4 @@ -Put PrtView.dll in the Q3Radiant plugins directory. +Put prtview.dll in the Q3Radiant plugins directory. This program is pretty self explanitary, but point needs to be mentioned. In the configuration menu for 3D view options, diff --git a/contrib/prtview/PrtView.vcproj.out-of-date b/contrib/prtview/PrtView.vcproj.out-of-date deleted file mode 100644 index 9ecb4e33..00000000 --- a/contrib/prtview/PrtView.vcproj.out-of-date +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/contrib/prtview/prtview.def b/contrib/prtview/prtview.def new file mode 100644 index 00000000..43318bd8 --- /dev/null +++ b/contrib/prtview/prtview.def @@ -0,0 +1,7 @@ +; PrtView.def : Declares the module parameters for the DLL. + +LIBRARY "PrtView" + +EXPORTS + ; Explicit exports can go here + Synapse_EnumerateInterfaces @1 diff --git a/contrib/prtview/prtview.vcproj b/contrib/prtview/prtview.vcproj new file mode 100644 index 00000000..ad897d1f --- /dev/null +++ b/contrib/prtview/prtview.vcproj @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/ufoai/ufoai.def b/contrib/ufoai/ufoai.def index 764cbb4f..9b54378b 100644 --- a/contrib/ufoai/ufoai.def +++ b/contrib/ufoai/ufoai.def @@ -1,7 +1,6 @@ ; ufoai.def : Declares the module parameters for the DLL. LIBRARY "UFOAI" -DESCRIPTION 'UFOAI Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/contrib/ufoai/ufoai.vcproj b/contrib/ufoai/ufoai.vcproj new file mode 100644 index 00000000..070940ce --- /dev/null +++ b/contrib/ufoai/ufoai.vcproj @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/contrib/ufoai/ufoai.vcproj.out-of-date b/contrib/ufoai/ufoai.vcproj.out-of-date deleted file mode 100644 index 438c657a..00000000 --- a/contrib/ufoai/ufoai.vcproj.out-of-date +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gen.vcproj.out-of-date b/gen.vcproj.out-of-date deleted file mode 100644 index d443b6e6..00000000 --- a/gen.vcproj.out-of-date +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/eclassfgd/fgd.def b/plugins/eclassfgd/fgd.def index 7ca58d79..85249497 100644 --- a/plugins/eclassfgd/fgd.def +++ b/plugins/eclassfgd/fgd.def @@ -1,7 +1,6 @@ ; fgd.def : Declares the module parameters for the DLL. LIBRARY "FGD" -DESCRIPTION 'FGD Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/eclassfgd/fgd.vcproj b/plugins/eclassfgd/fgd.vcproj new file mode 100644 index 00000000..a36b54ea --- /dev/null +++ b/plugins/eclassfgd/fgd.vcproj @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/eclassfgd/fgd.vcproj.out-of-date b/plugins/eclassfgd/fgd.vcproj.out-of-date deleted file mode 100644 index cacf1a15..00000000 --- a/plugins/eclassfgd/fgd.vcproj.out-of-date +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/imagem8/imagem8.def b/plugins/imagem8/imagem8.def index 74739a05..ce23debd 100644 --- a/plugins/imagem8/imagem8.def +++ b/plugins/imagem8/imagem8.def @@ -1,7 +1,6 @@ ; imagem8.def : Declares the module parameters for the DLL. LIBRARY "ImageM8" -DESCRIPTION 'ImageM8 Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/imagem8/imagem8.vcproj b/plugins/imagem8/imagem8.vcproj new file mode 100644 index 00000000..b57e1529 --- /dev/null +++ b/plugins/imagem8/imagem8.vcproj @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/imagem8/imagem8.vcproj.out-of-date b/plugins/imagem8/imagem8.vcproj.out-of-date deleted file mode 100644 index a0f2bcf2..00000000 --- a/plugins/imagem8/imagem8.vcproj.out-of-date +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/imagewal/imagewal.def b/plugins/imagewal/imagewal.def index 5101a0cc..9d14c358 100644 --- a/plugins/imagewal/imagewal.def +++ b/plugins/imagewal/imagewal.def @@ -1,7 +1,6 @@ ; imagewal.def : Declares the module parameters for the DLL. LIBRARY "Imagewal" -DESCRIPTION 'Imagewal Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/imagewal/imagewal.vcproj b/plugins/imagewal/imagewal.vcproj new file mode 100644 index 00000000..e5188ee2 --- /dev/null +++ b/plugins/imagewal/imagewal.vcproj @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/imagewal/imagewal.vcproj.out-of-date b/plugins/imagewal/imagewal.vcproj.out-of-date deleted file mode 100644 index f32026be..00000000 --- a/plugins/imagewal/imagewal.vcproj.out-of-date +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/spritemodel/spritemodel.def b/plugins/spritemodel/spritemodel.def index fcc9245f..95a06f3b 100644 --- a/plugins/spritemodel/spritemodel.def +++ b/plugins/spritemodel/spritemodel.def @@ -1,7 +1,6 @@ ; md3model.def : Declares the module parameters for the DLL. LIBRARY "SPRITEMODEL" -DESCRIPTION 'SPRITEMODEL Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/spritemodel/spritemodel.vcproj b/plugins/spritemodel/spritemodel.vcproj new file mode 100644 index 00000000..3ed3bd42 --- /dev/null +++ b/plugins/spritemodel/spritemodel.vcproj @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/spritemodel/spritemodel.vcproj.out-of-date b/plugins/spritemodel/spritemodel.vcproj.out-of-date deleted file mode 100644 index da6392f4..00000000 --- a/plugins/spritemodel/spritemodel.vcproj.out-of-date +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/surface_heretic2/surface_heretic2.def b/plugins/surface_heretic2/surface_heretic2.def index 7f26db48..0924a861 100644 --- a/plugins/surface_heretic2/surface_heretic2.def +++ b/plugins/surface_heretic2/surface_heretic2.def @@ -1,7 +1,6 @@ ; surface_heretic2.def : Declares the module parameters for the DLL. LIBRARY "Surface_Heretic2" -DESCRIPTION 'Surface_Heretic2 Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/surface_heretic2/surface_heretic2.vcproj b/plugins/surface_heretic2/surface_heretic2.vcproj new file mode 100644 index 00000000..47ad7d66 --- /dev/null +++ b/plugins/surface_heretic2/surface_heretic2.vcproj @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date b/plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date deleted file mode 100644 index 27a665ed..00000000 --- a/plugins/surface_heretic2/surface_heretic2.vcproj.out-of-date +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/surface_heretic2/surfacedialog.cpp b/plugins/surface_heretic2/surfacedialog.cpp index 343ab291..6a8663cc 100644 --- a/plugins/surface_heretic2/surfacedialog.cpp +++ b/plugins/surface_heretic2/surfacedialog.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "gtkr_vector.h" -std::vector g_texdef_face_vector; +vector g_texdef_face_vector; inline texdef_to_face_t* get_texdef_face_list() { diff --git a/plugins/surface_quake2/surface_quake2.def b/plugins/surface_quake2/surface_quake2.def index 0cec1f32..8f1435ac 100644 --- a/plugins/surface_quake2/surface_quake2.def +++ b/plugins/surface_quake2/surface_quake2.def @@ -1,7 +1,6 @@ ; surface_quake2.def : Declares the module parameters for the DLL. LIBRARY "SURFACE_QUAKE2" -DESCRIPTION 'SURFACE_QUAKE2 Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/surface_quake2/surface_quake2.vcproj b/plugins/surface_quake2/surface_quake2.vcproj new file mode 100644 index 00000000..1e6fce6f --- /dev/null +++ b/plugins/surface_quake2/surface_quake2.vcproj @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/surface_quake2/surface_quake2.vcproj.out-of-date b/plugins/surface_quake2/surface_quake2.vcproj.out-of-date deleted file mode 100644 index b940f023..00000000 --- a/plugins/surface_quake2/surface_quake2.vcproj.out-of-date +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/surface_quake2/surfacedialog.cpp b/plugins/surface_quake2/surfacedialog.cpp index 5c7efbf4..b1b7ec4c 100644 --- a/plugins/surface_quake2/surfacedialog.cpp +++ b/plugins/surface_quake2/surfacedialog.cpp @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "gtkr_vector.h" -std::vector g_texdef_face_vector; +vector g_texdef_face_vector; inline texdef_to_face_t* get_texdef_face_list() { diff --git a/plugins/surface_ufoai/surface_ufoai.def b/plugins/surface_ufoai/surface_ufoai.def index 23669a7b..588ea289 100644 --- a/plugins/surface_ufoai/surface_ufoai.def +++ b/plugins/surface_ufoai/surface_ufoai.def @@ -1,7 +1,6 @@ ; surface_ufoai.def : Declares the module parameters for the DLL. LIBRARY "SURFACE_UFOAI" -DESCRIPTION 'SURFACE_UFOAI Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/surface_ufoai/surface_ufoai.vcproj b/plugins/surface_ufoai/surface_ufoai.vcproj new file mode 100644 index 00000000..0d9c35aa --- /dev/null +++ b/plugins/surface_ufoai/surface_ufoai.vcproj @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date b/plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date deleted file mode 100644 index 1a69d667..00000000 --- a/plugins/surface_ufoai/surface_ufoai.vcproj.out-of-date +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/surface_ufoai/surfacedialog.cpp b/plugins/surface_ufoai/surfacedialog.cpp index dabe39b6..a8fe23ee 100644 --- a/plugins/surface_ufoai/surfacedialog.cpp +++ b/plugins/surface_ufoai/surfacedialog.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "gtkr_vector.h" -std::vector g_texdef_face_vector; +vector g_texdef_face_vector; inline texdef_to_face_t* get_texdef_face_list() { diff --git a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp b/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp index 6049ea46..47b18975 100644 --- a/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp +++ b/plugins/surface_ufoai/surfaceflagsdialog_ufoai.cpp @@ -33,6 +33,11 @@ GtkWidget *notebook1; // 32 bit is the max #define MAX_BUTTONS 32 +#ifdef _WIN32 + // TTimo: THIS IS UGLY +#define snprintf _snprintf +#endif + GtkWidget *surface_buttons[MAX_BUTTONS]; GtkWidget *content_buttons[MAX_BUTTONS]; diff --git a/plugins/textool/TexTool.def b/plugins/textool/TexTool.def deleted file mode 100644 index 95cbb273..00000000 --- a/plugins/textool/TexTool.def +++ /dev/null @@ -1,12 +0,0 @@ -; TexTool.def : Declares the module parameters for the DLL. - -LIBRARY "TexTool" -DESCRIPTION 'TexTool Windows Dynamic Link Library' - -EXPORTS - ; Explicit exports can go here - QERPlug_Init @1 - QERPlug_GetName @2 - QERPlug_GetCommandList @3 - QERPlug_Dispatch @4 - QERPlug_GetFuncTable @5 diff --git a/plugins/textool/TexTool.vcproj.out-of-date b/plugins/textool/TexTool.vcproj.out-of-date deleted file mode 100644 index f1f6a838..00000000 --- a/plugins/textool/TexTool.vcproj.out-of-date +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/textool/textool.def b/plugins/textool/textool.def new file mode 100644 index 00000000..b35f4866 --- /dev/null +++ b/plugins/textool/textool.def @@ -0,0 +1,7 @@ +; textool.def : Declares the module parameters for the DLL. + +LIBRARY "TexTool" + +EXPORTS + ; Explicit exports can go here + Synapse_EnumerateInterfaces @1 diff --git a/plugins/textool/textool.vcproj b/plugins/textool/textool.vcproj new file mode 100644 index 00000000..f90f1c4a --- /dev/null +++ b/plugins/textool/textool.vcproj @@ -0,0 +1,197 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/vfspak/vfs.cpp b/plugins/vfspak/vfs.cpp index 6779d231..e64ee4f1 100644 --- a/plugins/vfspak/vfs.cpp +++ b/plugins/vfspak/vfs.cpp @@ -405,7 +405,7 @@ void vfsInitDirectory (const char *path) if(name == NULL) break; - char *ext = strrchr (name, '.'); + const char *ext = strrchr (name, '.'); if ((ext == NULL) || (strcasecmp (ext, ".pak") != 0)) continue; diff --git a/plugins/vfspak/vfspak.def b/plugins/vfspak/vfspak.def index 5172d2d8..36baca3f 100644 --- a/plugins/vfspak/vfspak.def +++ b/plugins/vfspak/vfspak.def @@ -1,7 +1,6 @@ ; vfspak.def : Declares the module parameters for the DLL. LIBRARY "VFSPAK" -DESCRIPTION 'VFSPAK Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/vfspak/vfspak.vcproj b/plugins/vfspak/vfspak.vcproj new file mode 100644 index 00000000..f45bdd3e --- /dev/null +++ b/plugins/vfspak/vfspak.vcproj @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/vfspak/vfspak.vcproj.out-of-date b/plugins/vfspak/vfspak.vcproj.out-of-date deleted file mode 100644 index e39d942e..00000000 --- a/plugins/vfspak/vfspak.vcproj.out-of-date +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/vfswad/vfs.cpp b/plugins/vfswad/vfs.cpp index b6e69823..5aca73a0 100644 --- a/plugins/vfswad/vfs.cpp +++ b/plugins/vfswad/vfs.cpp @@ -380,7 +380,7 @@ void vfsInitDirectory (const char *path) if(name == NULL) break; - char *ext = strrchr (name, '.'); + const char *ext = strrchr (name, '.'); if ((ext == NULL) || (strcmp (ext, ".wad") != 0)) continue; diff --git a/plugins/vfswad/vfswad.def b/plugins/vfswad/vfswad.def index 0515e470..ef21fb84 100644 --- a/plugins/vfswad/vfswad.def +++ b/plugins/vfswad/vfswad.def @@ -1,7 +1,6 @@ ; vfswad.def : Declares the module parameters for the DLL. LIBRARY "vfswad" -DESCRIPTION 'vfswad Windows Dynamic Link Library' EXPORTS ; Explicit exports can go here diff --git a/plugins/vfswad/vfswad.vcproj b/plugins/vfswad/vfswad.vcproj new file mode 100644 index 00000000..b5df30d1 --- /dev/null +++ b/plugins/vfswad/vfswad.vcproj @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/vfswad/vfswad.vcproj.out-of-date b/plugins/vfswad/vfswad.vcproj.out-of-date deleted file mode 100644 index f44ee23c..00000000 --- a/plugins/vfswad/vfswad.vcproj.out-of-date +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/radiant.sln b/radiant.sln index 529feffd..9561a1db 100644 --- a/radiant.sln +++ b/radiant.sln @@ -9,6 +9,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "radiant", "radiant\radiant. {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{CD40B764-1D47-4FAE-8C6A-EF036E478D65}" + ProjectSection(ProjectDependencies) = postProject + {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 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}" @@ -25,6 +35,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "md5lib", "libs\md5lib\md5li EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "picomodel", "libs\picomodel\picomodel.vcproj", "{818BAC3D-0399-4416-930D-0AA28D55F798}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "splines", "libs\splines\splines.vcproj", "{6C1116CE-D99E-4629-9E69-A9329335D706}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "camera", "contrib\camera\camera.vcproj", "{A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}" ProjectSection(ProjectDependencies) = postProject {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} @@ -80,16 +92,88 @@ 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}") = "vfspak", "plugins\vfspak\vfspak.vcproj", "{8BE599BF-6318-4B0C-AC3E-DE811676C63B}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3map2", "tools\quake3\q3map2\q3map2.vcproj", "{CD40B764-1D47-4FAE-8C6A-EF036E478D65}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vfswad", "plugins\vfswad\vfswad.vcproj", "{18116120-2710-4DD8-B1AC-940D0BDB36EF}" ProjectSection(ProjectDependencies) = postProject - {12E69671-B980-4BFF-BC1A-6D9A3C158D16} = {12E69671-B980-4BFF-BC1A-6D9A3C158D16} - {818BAC3D-0399-4416-930D-0AA28D55F798} = {818BAC3D-0399-4416-930D-0AA28D55F798} + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fgd", "plugins\eclassfgd\fgd.vcproj", "{04213509-5ED3-4C74-B8A2-480BE6F48363}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagewal", "plugins\imagewal\imagewal.vcproj", "{8D3160AB-B386-4970-8146-826BC293CCB1}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imagem8", "plugins\imagem8\imagem8.vcproj", "{C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spritemodel", "plugins\spritemodel\spritemodel.vcproj", "{F291A09D-73BC-48FF-98EE-D672BBDE5C16}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} {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 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "textool", "plugins\textool\textool.vcproj", "{4F52DED4-285A-4E99-9C78-734D59E8ACD6}" + ProjectSection(ProjectDependencies) = postProject + {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}") = "surface_ufoai", "plugins\surface_ufoai\surface_ufoai.vcproj", "{F400371F-455F-4B6C-9F13-A2E57110E725}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_quake2", "plugins\surface_quake2\surface_quake2.vcproj", "{32AB82AA-C781-4E5E-83A0-A164D371306F}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "surface_heretic2", "plugins\surface_heretic2\surface_heretic2.vcproj", "{12932084-E212-45AB-B3BE-A2A5AEEBA581}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prtview", "contrib\prtview\prtview.vcproj", "{AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hydratoolz", "contrib\hydratoolz\hydratoolz.vcproj", "{4E63003A-6B5D-4076-8ADF-D5A94809CE32}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bobtoolz", "contrib\bobtoolz\bobtoolz.vcproj", "{302086A7-5C73-42A4-8591-F5C9336EC911}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + {14734EBB-B167-48D9-9B93-2277F645925F} = {14734EBB-B167-48D9-9B93-2277F645925F} + {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkgensurf", "contrib\gtkgensurf\gtkgensurf.vcproj", "{E37A9846-84FC-48F8-9880-954C5D9F8ED0}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoai\ufoai.vcproj", "{850DD97C-B457-497D-B5F5-DA1904FAC5F9}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bkgrnd2d", "contrib\bkgrnd2d\bkgrnd2d.vcproj", "{D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}" + ProjectSection(ProjectDependencies) = postProject + {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} = {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} EndProjectSection EndProject Global @@ -174,6 +258,70 @@ Global {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 + {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|Win32.ActiveCfg = Debug|Win32 + {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|Win32.Build.0 = Debug|Win32 + {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Release|Win32.ActiveCfg = Release|Win32 + {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Release|Win32.Build.0 = Release|Win32 + {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|Win32.Build.0 = Debug|Win32 + {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Release|Win32.ActiveCfg = Release|Win32 + {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Release|Win32.Build.0 = Release|Win32 + {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|Win32.ActiveCfg = Debug|Win32 + {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|Win32.Build.0 = Debug|Win32 + {04213509-5ED3-4C74-B8A2-480BE6F48363}.Release|Win32.ActiveCfg = Release|Win32 + {04213509-5ED3-4C74-B8A2-480BE6F48363}.Release|Win32.Build.0 = Release|Win32 + {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|Win32.ActiveCfg = Debug|Win32 + {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|Win32.Build.0 = Debug|Win32 + {8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.ActiveCfg = Release|Win32 + {8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.Build.0 = Release|Win32 + {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.ActiveCfg = Debug|Win32 + {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.Build.0 = Debug|Win32 + {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|Win32.ActiveCfg = Release|Win32 + {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|Win32.Build.0 = Release|Win32 + {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|Win32.ActiveCfg = Debug|Win32 + {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|Win32.Build.0 = Debug|Win32 + {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Release|Win32.ActiveCfg = Release|Win32 + {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Release|Win32.Build.0 = Release|Win32 + {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|Win32.ActiveCfg = Debug|Win32 + {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|Win32.Build.0 = Debug|Win32 + {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Release|Win32.ActiveCfg = Release|Win32 + {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Release|Win32.Build.0 = Release|Win32 + {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|Win32.ActiveCfg = Debug|Win32 + {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|Win32.Build.0 = Debug|Win32 + {F400371F-455F-4B6C-9F13-A2E57110E725}.Release|Win32.ActiveCfg = Release|Win32 + {F400371F-455F-4B6C-9F13-A2E57110E725}.Release|Win32.Build.0 = Release|Win32 + {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|Win32.ActiveCfg = Debug|Win32 + {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|Win32.Build.0 = Debug|Win32 + {32AB82AA-C781-4E5E-83A0-A164D371306F}.Release|Win32.ActiveCfg = Release|Win32 + {32AB82AA-C781-4E5E-83A0-A164D371306F}.Release|Win32.Build.0 = Release|Win32 + {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|Win32.ActiveCfg = Debug|Win32 + {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|Win32.Build.0 = Debug|Win32 + {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Release|Win32.ActiveCfg = Release|Win32 + {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Release|Win32.Build.0 = Release|Win32 + {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|Win32.ActiveCfg = Debug|Win32 + {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|Win32.Build.0 = Debug|Win32 + {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Release|Win32.ActiveCfg = Release|Win32 + {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Release|Win32.Build.0 = Release|Win32 + {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|Win32.ActiveCfg = Debug|Win32 + {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|Win32.Build.0 = Debug|Win32 + {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Release|Win32.ActiveCfg = Release|Win32 + {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Release|Win32.Build.0 = Release|Win32 + {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|Win32.ActiveCfg = Debug|Win32 + {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|Win32.Build.0 = Debug|Win32 + {302086A7-5C73-42A4-8591-F5C9336EC911}.Release|Win32.ActiveCfg = Release|Win32 + {302086A7-5C73-42A4-8591-F5C9336EC911}.Release|Win32.Build.0 = Release|Win32 + {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|Win32.ActiveCfg = Debug|Win32 + {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|Win32.Build.0 = Debug|Win32 + {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Release|Win32.ActiveCfg = Release|Win32 + {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Release|Win32.Build.0 = Release|Win32 + {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|Win32.ActiveCfg = Debug|Win32 + {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|Win32.Build.0 = Debug|Win32 + {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Release|Win32.ActiveCfg = Release|Win32 + {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Release|Win32.Build.0 = Release|Win32 + {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|Win32.ActiveCfg = Debug|Win32 + {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|Win32.Build.0 = Debug|Win32 + {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Release|Win32.ActiveCfg = Release|Win32 + {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.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 diff --git a/radiant.xcode/project.pbxproj b/radiant.xcode/project.pbxproj index 4157860b..b5f41ab9 100644 --- a/radiant.xcode/project.pbxproj +++ b/radiant.xcode/project.pbxproj @@ -597,7 +597,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "TexTool.def.svn-base"; + path = "textool.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -613,7 +613,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "TexTool.vcproj.svn-base"; + path = "textool.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -731,7 +731,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "TexTool.def.svn-work"; + path = "textool.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -747,7 +747,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "TexTool.vcproj.svn-work"; + path = "textool.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -873,7 +873,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "TexTool.def.svn-base"; + path = "textool.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -889,7 +889,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = "TexTool.vcproj.svn-base"; + path = "textool.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -1051,7 +1051,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "TexTool.def.svn-work"; + path = "textool.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -1067,7 +1067,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "TexTool.vcproj.svn-work"; + path = "textool.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -1423,7 +1423,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = TexTool.def; + path = textool.def; refType = 4; sourceTree = ""; }; @@ -1439,7 +1439,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = TexTool.vcproj; + path = textool.vcproj; refType = 4; sourceTree = ""; }; @@ -52114,7 +52114,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "bobToolz.def.svn-base"; + path = "bobtoolz.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -52138,7 +52138,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "bobToolz_gtk.vcproj.svn-base"; + path = "bobtoolz.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -52662,7 +52662,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "bobToolz.def.svn-work"; + path = "bobtoolz.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -52686,7 +52686,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "bobToolz_gtk.vcproj.svn-work"; + path = "bobtoolz.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -53218,7 +53218,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "bobToolz.def.svn-base"; + path = "bobtoolz.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -53242,7 +53242,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = "bobToolz_gtk.vcproj.svn-base"; + path = "bobtoolz.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -53810,7 +53810,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "bobToolz.def.svn-work"; + path = "bobtoolz.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -53834,7 +53834,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "bobToolz_gtk.vcproj.svn-work"; + path = "bobtoolz.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -54820,7 +54820,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = bobToolz.def; + path = bobtoolz.def; refType = 4; sourceTree = ""; }; @@ -54844,7 +54844,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = bobToolz_gtk.vcproj; + path = bobtoolz.vcproj; refType = 4; sourceTree = ""; }; @@ -58770,7 +58770,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "gensurf.def.svn-base"; + path = "gtkgensurf.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -58940,7 +58940,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "gensurf.def.svn-work"; + path = "gtkgensurf.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -59118,7 +59118,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "gensurf.def.svn-base"; + path = "gtkgensurf.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -59332,7 +59332,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "gensurf.def.svn-work"; + path = "gtkgensurf.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -59468,7 +59468,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = gensurf.def; + path = gtkgensurf.def; refType = 4; sourceTree = ""; }; @@ -60508,7 +60508,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "PrtView.def.svn-base"; + path = "prtview.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -60540,7 +60540,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "PrtView.vcproj.svn-base"; + path = "prtview.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -60705,7 +60705,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "PrtView.def.svn-work"; + path = "prtview.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -60737,7 +60737,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "PrtView.vcproj.svn-work"; + path = "prtview.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -60909,7 +60909,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "PrtView.def.svn-base"; + path = "prtview.def.svn-base"; refType = 4; sourceTree = ""; }; @@ -60941,7 +60941,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = "PrtView.vcproj.svn-base"; + path = "prtview.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -61150,7 +61150,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "PrtView.def.svn-work"; + path = "prtview.def.svn-work"; refType = 4; sourceTree = ""; }; @@ -61182,7 +61182,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "PrtView.vcproj.svn-work"; + path = "prtview.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -61309,7 +61309,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = PrtView.def; + path = prtview.def; refType = 4; sourceTree = ""; }; @@ -61341,7 +61341,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = PrtView.vcproj; + path = prtview.vcproj; refType = 4; sourceTree = ""; }; @@ -86923,7 +86923,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "Splines.vcproj.svn-base"; + path = "splines.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -87093,7 +87093,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "Splines.vcproj.svn-work"; + path = "splines.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -87271,7 +87271,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = "Splines.vcproj.svn-base"; + path = "splines.vcproj.svn-base"; refType = 4; sourceTree = ""; }; @@ -87485,7 +87485,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text; - path = "Splines.vcproj.svn-work"; + path = "splines.vcproj.svn-work"; refType = 4; sourceTree = ""; }; @@ -87621,7 +87621,7 @@ fileEncoding = 30; isa = PBXFileReference; lastKnownFileType = text.plist.xml; - path = Splines.vcproj; + path = splines.vcproj; refType = 4; sourceTree = ""; }; diff --git a/radiant/glwidget.cpp b/radiant/glwidget.cpp index 57699b37..0e7adc70 100644 --- a/radiant/glwidget.cpp +++ b/radiant/glwidget.cpp @@ -34,9 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#ifndef _WIN32 #include -#endif #include "glwidget.h" #include "qgl.h" @@ -212,108 +210,48 @@ gboolean WINAPI gtk_glwidget_make_current (GtkWidget *widget) } -#ifdef _WIN32 - -GLuint font_list_base; -static gchar font_string[] = "courier 8"; -static gint font_height; -static int font_created = 0; - -#else - // Think about rewriting this font stuff to use OpenGL display lists and glBitmap(). // Bit maps together with display lists may offer a performance increase, but // they would not allow antialiased fonts. +#ifdef _WIN32 +static const char font_string[] = "Courier bold"; +static const int font_height = 9; +#else static const char font_string[] = "Monospace"; static const int font_height = 10; +#endif static int font_ascent = -1; static int font_descent = -1; static int y_offset_bitmap_render_pango_units = -1; static PangoContext *ft2_context = NULL; static int _debug_font_created = 0; -#endif - // Units are pixels. Returns a positive value [most likely]. int gtk_glwidget_font_ascent() { -#ifdef _WIN32 - - return 6; // Approximation. - -#else - if (!_debug_font_created) { Error("Programming error: gtk_glwidget_font_ascent() called but font does not exist; " "you should have called gtk_glwidget_create_font() first"); } return font_ascent; - -#endif } // Units are pixels. Returns a positive value [most likely]. int gtk_glwidget_font_descent() { -#ifdef _WIN32 - - return 0; // Approximation. - -#else - if (!_debug_font_created) { Error("Programming error: gtk_glwidget_font_descent() called but font does not exist; " "you should have called gtk_glwidget_create_font() first"); } return font_descent; - -#endif } -#ifdef _WIN32 - -void gtk_glwidget_create_font_win_internal() -{ - if (font_created) return; - font_created = 1; - - PangoFontDescription *font_desc; - PangoFont *font; - PangoFontMetrics *font_metrics; - - font_list_base = qglGenLists (256); - - font_desc = pango_font_description_from_string (font_string); - - font = gdk_gl_font_use_pango_font (font_desc, 0, 256, font_list_base); - - if(font != NULL) - { - font_metrics = pango_font_get_metrics (font, NULL); - - font_height = pango_font_metrics_get_ascent (font_metrics) + - pango_font_metrics_get_descent (font_metrics); - font_height = PANGO_PIXELS (font_height); - - pango_font_metrics_unref (font_metrics); - } - - pango_font_description_free (font_desc); -} - -#endif void gtk_glwidget_create_font() { -#ifdef _WIN32 - - // Do nothing. - -#else - PangoFontDescription *font_desc; PangoLayout *layout; PangoRectangle log_rect; @@ -336,15 +274,6 @@ void gtk_glwidget_create_font() layout = pango_layout_new(ft2_context); -#ifdef _WIN32 - - PangoLayoutIter *iter; - iter = pango_layout_get_iter(layout); - font_ascent_pango_units = pango_layout_iter_get_baseline(iter); - pango_layout_iter_free(iter); - -#else - // I don't believe that's standard preprocessor syntax? #if !PANGO_VERSION_CHECK(1,22,0) PangoLayoutIter *iter; @@ -353,8 +282,6 @@ void gtk_glwidget_create_font() pango_layout_iter_free(iter); #else font_ascent_pango_units = pango_layout_get_baseline(layout); -#endif - #endif pango_layout_get_extents(layout, NULL, &log_rect); @@ -364,18 +291,10 @@ void gtk_glwidget_create_font() font_ascent = PANGO_PIXELS_CEIL(font_ascent_pango_units); font_descent = PANGO_PIXELS_CEIL(font_descent_pango_units); y_offset_bitmap_render_pango_units = (font_ascent * PANGO_SCALE) - font_ascent_pango_units; - -#endif } void gtk_glwidget_destroy_font() { -#ifdef _WIN32 - - // Do nothing. - -#else - if (!_debug_font_created) { Error("Programming error: gtk_glwidget_destroy_font() called when font " "does not exist"); @@ -386,8 +305,6 @@ void gtk_glwidget_destroy_font() y_offset_bitmap_render_pango_units = -1; g_object_unref(G_OBJECT(ft2_context)); _debug_font_created = 0; - -#endif } @@ -403,14 +320,6 @@ void gtk_glwidget_destroy_font() // Google for "glDrawPixels clipping". void gtk_glwidget_print_string(const char *s) { -#ifdef _WIN32 - - gtk_glwidget_create_font_win_internal(); - qglListBase(font_list_base); - qglCallLists(strlen(s), GL_UNSIGNED_BYTE, (unsigned char *)s); - -#else - // The idea for this code initially came from the font-pangoft2.c example that comes with GtkGLExt. PangoLayout *layout; @@ -484,24 +393,12 @@ void gtk_glwidget_print_string(const char *s) } g_object_unref(G_OBJECT(layout)); - -#endif } void gtk_glwidget_print_char(char s) { -#ifdef _WIN32 - - gtk_glwidget_create_font_win_internal(); - qglListBase(font_list_base); - qglCallLists(1, GL_UNSIGNED_BYTE, (unsigned char *) &s); - -#else - char str[2]; str[0] = s; str[1] = '\0'; gtk_glwidget_print_string(str); - -#endif } diff --git a/radiant/radiant.vcproj b/radiant/radiant.vcproj index 8584ff80..ad3b7e31 100644 --- a/radiant/radiant.vcproj +++ b/radiant/radiant.vcproj @@ -39,7 +39,7 @@