From 17349a28db96c2f0e05d4f37e400ff44444d4c45 Mon Sep 17 00:00:00 2001 From: QBall147 Date: Thu, 14 Aug 2014 19:05:13 +0100 Subject: [PATCH 01/18] Increase MAX_MAP_VISIBILITY as certain QuakeLive maps are starting to hit the limit --- tools/quake3/q3map2/q3map2.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index 936905d7..bfb83ec8 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 From 1a70de0efe2a4cabfc1fa27c0d264cc136feaf0c Mon Sep 17 00:00:00 2001 From: Pan7 Date: Sun, 4 Oct 2015 10:53:05 +0200 Subject: [PATCH 02/18] Angle arrow for entities with angle and fixed size --- radiant/eclass_def.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/radiant/eclass_def.cpp b/radiant/eclass_def.cpp index 7db391c5..5cf5c2c0 100644 --- a/radiant/eclass_def.cpp +++ b/radiant/eclass_def.cpp @@ -250,6 +250,12 @@ eclass_t *Eclass_InitFromText( char *text ){ ) { e->nShowFlags |= ECLASS_ANGLE; } + for ( i = 0 ; i < MAX_FLAGS ; i++ ) + { + if ( e->flagnames[i] && e->flagnames[i][0] != 0 && strcmpi( e->flagnames[i], "angle" ) && e->fixedsize ) { + e->nShowFlags |= ECLASS_ANGLE; + } + } if ( strcmpi( e->name, "path" ) == 0 ) { e->nShowFlags |= ECLASS_PATH; } From c9611524088411874d7063b1c829eaa0555e9d15 Mon Sep 17 00:00:00 2001 From: Mateos81 Date: Mon, 5 Oct 2015 23:11:24 +0200 Subject: [PATCH 03/18] Step 1: Numeric Keypad changes Grid Size --- radiant/mainframe.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 33b94d1a..62c09a35 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -20,7 +20,7 @@ */ // -// Main Window for Q3Radiant +// Main Window for GtkRadiant // // Leonardo Zide (leo@lokigames.com) // @@ -44,7 +44,7 @@ extern "C" { #include "patchdialog.h" #include "filters.h" -// use this to verbose what happens with the beyboard +// use this to verbose what happens with the keyboard #ifdef _DEBUG // #define DBG_KBD #endif @@ -162,15 +162,25 @@ SCommandInfo g_Commands[] = {"CameraStrafeRight", GDK_period, 0, ID_CAMERA_STRAFERIGHT, "menu_camera_straferight"}, {"CameraStrafeLeft", GDK_comma, 0, ID_CAMERA_STRAFELEFT, "menu_camera_strafeleft"}, {"ToggleGrid", '0', 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, + {"ToggleGrid", GDK_KP_0, 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, {"SetGrid1", '1', 0, ID_GRID_1, "menu_grid_1"}, + {"SetGrid1", GDK_KP_1, 0, ID_GRID_1, "menu_grid_1"}, {"SetGrid2", '2', 0, ID_GRID_2, "menu_grid_2"}, + {"SetGrid2", GDK_KP_2, 0, ID_GRID_2, "menu_grid_2"}, {"SetGrid4", '3', 0, ID_GRID_4, "menu_grid_4"}, + {"SetGrid4", GDK_KP_3, 0, ID_GRID_4, "menu_grid_4"}, {"SetGrid8", '4', 0, ID_GRID_8, "menu_grid_8"}, + {"SetGrid8", GDK_KP_4, 0, ID_GRID_8, "menu_grid_8"}, {"SetGrid16", '5', 0, ID_GRID_16, "menu_grid_16"}, + {"SetGrid16", GDK_KP_5, 0, ID_GRID_16, "menu_grid_16"}, {"SetGrid32", '6', 0, ID_GRID_32, "menu_grid_32"}, + {"SetGrid32", GDK_KP_6, 0, ID_GRID_32, "menu_grid_32"}, {"SetGrid64", '7', 0, ID_GRID_64, "menu_grid_64"}, + {"SetGrid64", GDK_KP_7, 0, ID_GRID_64, "menu_grid_64"}, {"SetGrid128", '8', 0, ID_GRID_128, "menu_grid_128"}, + {"SetGrid128", GDK_KP_8, 0, ID_GRID_128, "menu_grid_128"}, {"SetGrid256", '9', 0, ID_GRID_256, "menu_grid_256"}, + {"SetGrid256", GDK_KP_9, 0, ID_GRID_256, "menu_grid_256"}, {"DragEdges", 'E', 0, ID_SELECTION_DRAGEDGES, "menu_selection_dragedges"}, {"DragVertices", 'V', 0, ID_SELECTION_DRAGVERTECIES, "menu_selection_dragvertecies"}, {"ViewEntityInfo", 'N', 0, ID_VIEW_ENTITY, "menu_view_entity"}, From 565a183cef9a05cf32da64dafc7cc15d065c608d Mon Sep 17 00:00:00 2001 From: Mateos81 Date: Mon, 5 Oct 2015 23:20:30 +0200 Subject: [PATCH 04/18] Step 2: Alt + Numeric Keypad filters --- radiant/mainframe.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 62c09a35..96a500b2 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -268,16 +268,26 @@ SCommandInfo g_Commands[] = {"Sleep", 'P', 0x05, ID_FILE_SLEEP, "menu_file_sleep"}, {"SimplePatchMesh", 'P', 0x01, ID_CURVE_SIMPLEPATCHMESH, "menu_simplepatchmesh"}, {"FilterWorldBrushes", '1', RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, + {"FilterWorldBrushes", GDK_KP_1, RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, {"FilterEntities", '2', RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, + {"FilterEntities", GDK_KP_2, RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, {"FilterAreaportals", '3', RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, + {"FilterAreaportals", GDK_KP_3, RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, {"FilterTranslucent", '4', RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, + {"FilterTranslucent", GDK_KP_4, RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, {"FilterLiquids", '5', RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, + {"FilterLiquids", GDK_KP_5, RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, {"FilterCaulk", '6', RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, + {"FilterCaulk", GDK_KP_6, RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, {"FilterClips", '7', RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, + {"FilterClips", GDK_KP_7, RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, {"FilterBotClips", 'M', RAD_ALT, ID_FILTER_BOTCLIPS, "menu_filter_botclips"}, {"FilterPaths", '8', RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, + {"FilterPaths", GDK_KP_8, RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, {"FilterClusterportals", '9', RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, + {"FilterClusterportals", GDK_KP_9, RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, {"FilterLights", '0', RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, + {"FilterLights", GDK_KP_0, RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, {"FilterPatches", 'P', RAD_CONTROL, ID_FILTER_PATCHES, "menu_filter_patches"}, {"FilterDetails", 'D', RAD_CONTROL, ID_FILTER_DETAILS, "menu_filter_details"}, {"FilterStructural", 'D', RAD_CONTROL | RAD_SHIFT, ID_FILTER_STRUCTURAL, "menu_filter_structural"}, From 98476ca2e646e5b1197b46d70fee5b5888b5b16f Mon Sep 17 00:00:00 2001 From: Mateos81 Date: Tue, 6 Oct 2015 18:09:05 +0200 Subject: [PATCH 05/18] Replaced spaces by tabs... Sorry ^^' --- radiant/mainframe.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 96a500b2..79b14500 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -162,25 +162,25 @@ SCommandInfo g_Commands[] = {"CameraStrafeRight", GDK_period, 0, ID_CAMERA_STRAFERIGHT, "menu_camera_straferight"}, {"CameraStrafeLeft", GDK_comma, 0, ID_CAMERA_STRAFELEFT, "menu_camera_strafeleft"}, {"ToggleGrid", '0', 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, - {"ToggleGrid", GDK_KP_0, 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, + {"ToggleGrid", GDK_KP_0, 0, ID_GRID_TOGGLE, "menu_grid_toggle"}, {"SetGrid1", '1', 0, ID_GRID_1, "menu_grid_1"}, - {"SetGrid1", GDK_KP_1, 0, ID_GRID_1, "menu_grid_1"}, + {"SetGrid1", GDK_KP_1, 0, ID_GRID_1, "menu_grid_1"}, {"SetGrid2", '2', 0, ID_GRID_2, "menu_grid_2"}, - {"SetGrid2", GDK_KP_2, 0, ID_GRID_2, "menu_grid_2"}, + {"SetGrid2", GDK_KP_2, 0, ID_GRID_2, "menu_grid_2"}, {"SetGrid4", '3', 0, ID_GRID_4, "menu_grid_4"}, - {"SetGrid4", GDK_KP_3, 0, ID_GRID_4, "menu_grid_4"}, + {"SetGrid4", GDK_KP_3, 0, ID_GRID_4, "menu_grid_4"}, {"SetGrid8", '4', 0, ID_GRID_8, "menu_grid_8"}, - {"SetGrid8", GDK_KP_4, 0, ID_GRID_8, "menu_grid_8"}, + {"SetGrid8", GDK_KP_4, 0, ID_GRID_8, "menu_grid_8"}, {"SetGrid16", '5', 0, ID_GRID_16, "menu_grid_16"}, - {"SetGrid16", GDK_KP_5, 0, ID_GRID_16, "menu_grid_16"}, + {"SetGrid16", GDK_KP_5, 0, ID_GRID_16, "menu_grid_16"}, {"SetGrid32", '6', 0, ID_GRID_32, "menu_grid_32"}, - {"SetGrid32", GDK_KP_6, 0, ID_GRID_32, "menu_grid_32"}, + {"SetGrid32", GDK_KP_6, 0, ID_GRID_32, "menu_grid_32"}, {"SetGrid64", '7', 0, ID_GRID_64, "menu_grid_64"}, - {"SetGrid64", GDK_KP_7, 0, ID_GRID_64, "menu_grid_64"}, + {"SetGrid64", GDK_KP_7, 0, ID_GRID_64, "menu_grid_64"}, {"SetGrid128", '8', 0, ID_GRID_128, "menu_grid_128"}, - {"SetGrid128", GDK_KP_8, 0, ID_GRID_128, "menu_grid_128"}, + {"SetGrid128", GDK_KP_8, 0, ID_GRID_128, "menu_grid_128"}, {"SetGrid256", '9', 0, ID_GRID_256, "menu_grid_256"}, - {"SetGrid256", GDK_KP_9, 0, ID_GRID_256, "menu_grid_256"}, + {"SetGrid256", GDK_KP_9, 0, ID_GRID_256, "menu_grid_256"}, {"DragEdges", 'E', 0, ID_SELECTION_DRAGEDGES, "menu_selection_dragedges"}, {"DragVertices", 'V', 0, ID_SELECTION_DRAGVERTECIES, "menu_selection_dragvertecies"}, {"ViewEntityInfo", 'N', 0, ID_VIEW_ENTITY, "menu_view_entity"}, @@ -268,26 +268,26 @@ SCommandInfo g_Commands[] = {"Sleep", 'P', 0x05, ID_FILE_SLEEP, "menu_file_sleep"}, {"SimplePatchMesh", 'P', 0x01, ID_CURVE_SIMPLEPATCHMESH, "menu_simplepatchmesh"}, {"FilterWorldBrushes", '1', RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, - {"FilterWorldBrushes", GDK_KP_1, RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, + {"FilterWorldBrushes", GDK_KP_1, RAD_ALT, ID_FILTER_WORLD, "menu_filter_world"}, {"FilterEntities", '2', RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, - {"FilterEntities", GDK_KP_2, RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, + {"FilterEntities", GDK_KP_2, RAD_ALT, ID_FILTER_ENTITIES, "menu_filter_entities"}, {"FilterAreaportals", '3', RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, - {"FilterAreaportals", GDK_KP_3, RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, + {"FilterAreaportals", GDK_KP_3, RAD_ALT, ID_FILTER_AREAPORTALS, "menu_filter_areaportals"}, {"FilterTranslucent", '4', RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, - {"FilterTranslucent", GDK_KP_4, RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, + {"FilterTranslucent", GDK_KP_4, RAD_ALT, ID_FILTER_TRANSLUCENT, "menu_filter_translucent"}, {"FilterLiquids", '5', RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, - {"FilterLiquids", GDK_KP_5, RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, + {"FilterLiquids", GDK_KP_5, RAD_ALT, ID_FILTER_LIQUIDS, "menu_filter_liquids"}, {"FilterCaulk", '6', RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, - {"FilterCaulk", GDK_KP_6, RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, + {"FilterCaulk", GDK_KP_6, RAD_ALT, ID_FILTER_CAULK, "menu_filter_caulk"}, {"FilterClips", '7', RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, - {"FilterClips", GDK_KP_7, RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, + {"FilterClips", GDK_KP_7, RAD_ALT, ID_FILTER_CLIPS, "menu_filter_clips"}, {"FilterBotClips", 'M', RAD_ALT, ID_FILTER_BOTCLIPS, "menu_filter_botclips"}, {"FilterPaths", '8', RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, - {"FilterPaths", GDK_KP_8, RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, + {"FilterPaths", GDK_KP_8, RAD_ALT, ID_FILTER_PATHS, "menu_filter_paths"}, {"FilterClusterportals", '9', RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, - {"FilterClusterportals", GDK_KP_9, RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, + {"FilterClusterportals", GDK_KP_9, RAD_ALT, ID_FILTER_CLUSTERPORTALS, "menu_filter_clusterportals"}, {"FilterLights", '0', RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, - {"FilterLights", GDK_KP_0, RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, + {"FilterLights", GDK_KP_0, RAD_ALT, ID_FILTER_LIGHTS, "menu_filter_lights"}, {"FilterPatches", 'P', RAD_CONTROL, ID_FILTER_PATCHES, "menu_filter_patches"}, {"FilterDetails", 'D', RAD_CONTROL, ID_FILTER_DETAILS, "menu_filter_details"}, {"FilterStructural", 'D', RAD_CONTROL | RAD_SHIFT, ID_FILTER_STRUCTURAL, "menu_filter_structural"}, From 86a0a8d8c20949b8c8a1bba6b7144a5a95b7f4a6 Mon Sep 17 00:00:00 2001 From: Pan7 Date: Wed, 7 Oct 2015 11:06:01 +0200 Subject: [PATCH 06/18] Fix shrinking console --- radiant/mainframe.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 55ca61be..4d6dd0e1 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -2495,6 +2495,7 @@ void MainFrame::Create(){ MRU_Load(); create_main_toolbar( window, vbox ); create_plugin_toolbar( window,vbox ); + create_main_statusbar( window, vbox ); m_nCurrentStyle = g_PrefsDlg.m_nView; @@ -2608,7 +2609,7 @@ void MainFrame::Create(){ } } - gtk_paned_set_position( GTK_PANED( m_pSplits[0] ), g_PrefsDlg.mWindowInfo.nXYHeight + 28 ); + gtk_paned_set_position( GTK_PANED( m_pSplits[0] ), g_PrefsDlg.mWindowInfo.nXYHeight ); if ( CurrentStyle() == eRegular ) { gtk_paned_set_position( GTK_PANED( m_pSplits[2] ), g_PrefsDlg.mWindowInfo.nZWidth ); @@ -2876,8 +2877,6 @@ void MainFrame::Create(){ g_pParentWnd->OnEntitiesSetViewAs( 0 ); - create_main_statusbar( window, vbox ); - LoadCommandMap(); ShowMenuItemKeyBindings( window ); From 48369d78f97cfa4d4bd664451045e466ac31ea04 Mon Sep 17 00:00:00 2001 From: TTimo Date: Sat, 7 Nov 2015 23:44:49 -0600 Subject: [PATCH 07/18] - Convert to Visual Studio 2015 - Drop STLPort - Rebuild libxml2 binaries, update project files accordingly - Rebuild jpeg-9 binaries --- config.py | 2 +- contrib/bkgrnd2d/bkgrnd2d.vcxproj | 29 ++++++++++--------- contrib/bobtoolz/bobtoolz.vcxproj | 29 ++++++++++--------- contrib/camera/camera.vcxproj | 29 ++++++++++--------- contrib/gtkgensurf/gtkgensurf.vcxproj | 29 ++++++++++--------- contrib/hydratoolz/hydratoolz.vcxproj | 29 ++++++++++--------- contrib/prtview/prtview.vcxproj | 29 ++++++++++--------- include/stl_check.h | 2 ++ include/version.h | 6 ++-- libs/cmdlib/cmdlib.vcxproj | 5 ++-- libs/ddslib/ddslib.vcxproj | 5 ++-- libs/l_net/l_net.vcxproj | 5 ++-- libs/mathlib/mathlib.vcxproj | 5 ++-- libs/md5lib/md5lib.vcxproj | 5 ++-- libs/picomodel/picomodel.vcxproj | 5 ++-- libs/splines/splines.vcxproj | 5 ++-- libs/synapse/synapse.vcxproj | 13 +++++---- plugins/eclassfgd/fgd.vcxproj | 29 ++++++++++--------- plugins/entity/entity.vcxproj | 29 ++++++++++--------- plugins/image/image.vcxproj | 29 ++++++++++--------- plugins/imagehl/imagehl.vcxproj | 29 ++++++++++--------- plugins/imagem8/imagem8.vcxproj | 29 ++++++++++--------- plugins/imagepng/imagepng.vcxproj | 29 ++++++++++--------- plugins/imagewal/imagewal.vcxproj | 29 ++++++++++--------- plugins/map/map.vcxproj | 29 ++++++++++--------- plugins/mapxml/mapxml.vcxproj | 29 ++++++++++--------- plugins/model/model.vcxproj | 29 ++++++++++--------- plugins/shaders/shaders.vcxproj | 29 ++++++++++--------- plugins/spritemodel/spritemodel.vcxproj | 29 ++++++++++--------- plugins/surface/surface.vcxproj | 29 ++++++++++--------- .../surface_idtech2/surface_idtech2.vcxproj | 29 ++++++++++--------- plugins/textool/textool.vcxproj | 29 ++++++++++--------- plugins/vfspak/vfspak.vcxproj | 29 ++++++++++--------- plugins/vfspk3/vfspk3.vcxproj | 29 ++++++++++--------- plugins/vfsqlpk3/vfsqlpk3.vcxproj | 29 ++++++++++--------- plugins/vfswad/vfswad.vcxproj | 29 ++++++++++--------- radiant/radiant.vcxproj | 29 ++++++++++--------- tools/quake3/common/quake3-common.vcxproj | 13 +++++---- tools/quake3/q3data/q3data.vcxproj | 29 ++++++++++--------- tools/quake3/q3map2/q3map2.vcxproj | 29 ++++++++++--------- .../tools/quake3/q3map2/q3map2_urt.vcxproj | 29 ++++++++++--------- 41 files changed, 476 insertions(+), 436 deletions(-) diff --git a/config.py b/config.py index f8c3662f..ecf07b36 100644 --- a/config.py +++ b/config.py @@ -287,7 +287,7 @@ class Config: 'gtk-bundle-2.24.10-GtkRadiant.zip', 'gtk-bundle-2.22.1-win64-GtkRadiant.zip', 'jpeg-9-GtkRadiant.zip', - 'libxml2-2.9.1-GtkRadiant.zip', + 'libxml2-2.9.2-GtkRadiant.zip', 'gtkglext-1.2.0-3-win32.zip', ]: if ( not os.path.exists( lib_archive ) ): diff --git a/contrib/bkgrnd2d/bkgrnd2d.vcxproj b/contrib/bkgrnd2d/bkgrnd2d.vcxproj index 25453672..07771396 100644 --- a/contrib/bkgrnd2d/bkgrnd2d.vcxproj +++ b/contrib/bkgrnd2d/bkgrnd2d.vcxproj @@ -21,11 +21,12 @@ {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BKGRND2D_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bkgrnd2d.def true Windows diff --git a/contrib/bobtoolz/bobtoolz.vcxproj b/contrib/bobtoolz/bobtoolz.vcxproj index bb0f5567..f13d52e8 100644 --- a/contrib/bobtoolz/bobtoolz.vcxproj +++ b/contrib/bobtoolz/bobtoolz.vcxproj @@ -21,11 +21,12 @@ {302086A7-5C73-42A4-8591-F5C9336EC911} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;BOBTOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) bobtoolz.def true Windows diff --git a/contrib/camera/camera.vcxproj b/contrib/camera/camera.vcxproj index a4c0f4cb..da17b441 100644 --- a/contrib/camera/camera.vcxproj +++ b/contrib/camera/camera.vcxproj @@ -21,11 +21,12 @@ {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;CAMERA_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2.lib;synapse.lib;splines.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;intl.lib;libxml2_a.lib;synapse.lib;splines.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) camera.def true Windows diff --git a/contrib/gtkgensurf/gtkgensurf.vcxproj b/contrib/gtkgensurf/gtkgensurf.vcxproj index ec234394..3deb075e 100644 --- a/contrib/gtkgensurf/gtkgensurf.vcxproj +++ b/contrib/gtkgensurf/gtkgensurf.vcxproj @@ -21,11 +21,12 @@ {E37A9846-84FC-48F8-9880-954C5D9F8ED0} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;GTKGENSURF_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) gtkgensurf.def true Windows diff --git a/contrib/hydratoolz/hydratoolz.vcxproj b/contrib/hydratoolz/hydratoolz.vcxproj index 37226ec4..50edb130 100644 --- a/contrib/hydratoolz/hydratoolz.vcxproj +++ b/contrib/hydratoolz/hydratoolz.vcxproj @@ -21,11 +21,12 @@ {4E63003A-6B5D-4076-8ADF-D5A94809CE32} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;HYDRATOOLZ_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) hydratoolz.def true Windows diff --git a/contrib/prtview/prtview.vcxproj b/contrib/prtview/prtview.vcxproj index f4ff3eb8..cdbdc776 100644 --- a/contrib/prtview/prtview.vcxproj +++ b/contrib/prtview/prtview.vcxproj @@ -21,11 +21,12 @@ {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PRTVIEW_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) prtview.def true Windows diff --git a/include/stl_check.h b/include/stl_check.h index 89660091..5f5bf042 100644 --- a/include/stl_check.h +++ b/include/stl_check.h @@ -24,6 +24,8 @@ this allows to catch some weird errors early at compile time */ +#define Q_NO_STLPORT + #ifdef Q_NO_STLPORT // not using STLPort (gcc 3.x build) diff --git a/include/version.h b/include/version.h index 1d6a99cd..4616a693 100644 --- a/include/version.h +++ b/include/version.h @@ -1,4 +1,4 @@ // generated header, see makeversion.py -#define RADIANT_VERSION "1.6.4" -#define RADIANT_MINOR_VERSION "4" -#define RADIANT_MAJOR_VERSION "6" +#define RADIANT_VERSION "1.7.0" +#define RADIANT_MINOR_VERSION "0" +#define RADIANT_MAJOR_VERSION "7" diff --git a/libs/cmdlib/cmdlib.vcxproj b/libs/cmdlib/cmdlib.vcxproj index 8aa8c4de..c66325fe 100644 --- a/libs/cmdlib/cmdlib.vcxproj +++ b/libs/cmdlib/cmdlib.vcxproj @@ -21,11 +21,12 @@ {0B522841-BDCC-493A-BA5C-604AE2CD5756} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary diff --git a/libs/ddslib/ddslib.vcxproj b/libs/ddslib/ddslib.vcxproj index a2cf4b20..d8801187 100644 --- a/libs/ddslib/ddslib.vcxproj +++ b/libs/ddslib/ddslib.vcxproj @@ -21,11 +21,12 @@ {DDE81BE7-D457-47F3-9762-A838EFA2672E} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary diff --git a/libs/l_net/l_net.vcxproj b/libs/l_net/l_net.vcxproj index bef68bfa..9c0a8b66 100644 --- a/libs/l_net/l_net.vcxproj +++ b/libs/l_net/l_net.vcxproj @@ -21,11 +21,12 @@ {B957BA35-F807-4C84-85A2-C1F9AC56713B} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary diff --git a/libs/mathlib/mathlib.vcxproj b/libs/mathlib/mathlib.vcxproj index 02d92b13..a5fb91d7 100644 --- a/libs/mathlib/mathlib.vcxproj +++ b/libs/mathlib/mathlib.vcxproj @@ -21,11 +21,12 @@ {14734EBB-B167-48D9-9B93-2277F645925F} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary diff --git a/libs/md5lib/md5lib.vcxproj b/libs/md5lib/md5lib.vcxproj index f729d23b..6419c99b 100644 --- a/libs/md5lib/md5lib.vcxproj +++ b/libs/md5lib/md5lib.vcxproj @@ -21,11 +21,12 @@ {12E69671-B980-4BFF-BC1A-6D9A3C158D16} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary diff --git a/libs/picomodel/picomodel.vcxproj b/libs/picomodel/picomodel.vcxproj index b9bed4fe..a1b8394e 100644 --- a/libs/picomodel/picomodel.vcxproj +++ b/libs/picomodel/picomodel.vcxproj @@ -21,11 +21,12 @@ {818BAC3D-0399-4416-930D-0AA28D55F798} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary diff --git a/libs/splines/splines.vcxproj b/libs/splines/splines.vcxproj index 612d6e1f..cf90a3f2 100644 --- a/libs/splines/splines.vcxproj +++ b/libs/splines/splines.vcxproj @@ -21,11 +21,12 @@ {6C1116CE-D99E-4629-9E69-A9329335D706} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary diff --git a/libs/synapse/synapse.vcxproj b/libs/synapse/synapse.vcxproj index 82d35292..f958a265 100644 --- a/libs/synapse/synapse.vcxproj +++ b/libs/synapse/synapse.vcxproj @@ -21,11 +21,12 @@ {E13CCFB0-A366-4EF3-A66F-C374B563E4DF} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -85,7 +86,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -98,7 +99,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -109,7 +110,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/plugins/eclassfgd/fgd.vcxproj b/plugins/eclassfgd/fgd.vcxproj index c5aad7b6..6beda990 100644 --- a/plugins/eclassfgd/fgd.vcxproj +++ b/plugins/eclassfgd/fgd.vcxproj @@ -21,11 +21,12 @@ {04213509-5ED3-4C74-B8A2-480BE6F48363} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FGD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) fgd.def true Windows diff --git a/plugins/entity/entity.vcxproj b/plugins/entity/entity.vcxproj index 0cba3fd6..bb9dc617 100644 --- a/plugins/entity/entity.vcxproj +++ b/plugins/entity/entity.vcxproj @@ -21,11 +21,12 @@ {17DD38AA-4842-45BC-9304-2ADC1A12B4F4} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ENTITY_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) entity.def true Windows diff --git a/plugins/image/image.vcxproj b/plugins/image/image.vcxproj index f7e5cd9f..579c8149 100644 --- a/plugins/image/image.vcxproj +++ b/plugins/image/image.vcxproj @@ -21,11 +21,12 @@ {1F9977F6-216F-4AE1-9928-59B72CF31C46} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;jpeg.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) image.def true Windows diff --git a/plugins/imagehl/imagehl.vcxproj b/plugins/imagehl/imagehl.vcxproj index f61dbe74..01d2f9d1 100644 --- a/plugins/imagehl/imagehl.vcxproj +++ b/plugins/imagehl/imagehl.vcxproj @@ -21,11 +21,12 @@ {BA1BC409-744B-4270-8E47-BA10872313AD} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEHL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagehl.def true Windows diff --git a/plugins/imagem8/imagem8.vcxproj b/plugins/imagem8/imagem8.vcxproj index 6aeda675..692755eb 100644 --- a/plugins/imagem8/imagem8.vcxproj +++ b/plugins/imagem8/imagem8.vcxproj @@ -21,11 +21,12 @@ {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEM8_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagem8.def true Windows diff --git a/plugins/imagepng/imagepng.vcxproj b/plugins/imagepng/imagepng.vcxproj index a9bc6352..e00cdade 100644 --- a/plugins/imagepng/imagepng.vcxproj +++ b/plugins/imagepng/imagepng.vcxproj @@ -21,11 +21,12 @@ {43C01E60-21CC-49F5-8A11-F460BC866A31} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEPNG_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;libpng.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagepng.def true Windows diff --git a/plugins/imagewal/imagewal.vcxproj b/plugins/imagewal/imagewal.vcxproj index 7de7e507..b959384d 100644 --- a/plugins/imagewal/imagewal.vcxproj +++ b/plugins/imagewal/imagewal.vcxproj @@ -21,11 +21,12 @@ {8D3160AB-B386-4970-8146-826BC293CCB1} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IMAGEWAL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) imagewal.def true Windows diff --git a/plugins/map/map.vcxproj b/plugins/map/map.vcxproj index 0a9d7bd1..7883dd3f 100644 --- a/plugins/map/map.vcxproj +++ b/plugins/map/map.vcxproj @@ -21,11 +21,12 @@ {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAP_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) map.def true Windows diff --git a/plugins/mapxml/mapxml.vcxproj b/plugins/mapxml/mapxml.vcxproj index 33a50d61..14887615 100644 --- a/plugins/mapxml/mapxml.vcxproj +++ b/plugins/mapxml/mapxml.vcxproj @@ -21,11 +21,12 @@ {DDBF170A-42DF-4836-9006-816422E08493} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MAPXML_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) mapxml.def true Windows diff --git a/plugins/model/model.vcxproj b/plugins/model/model.vcxproj index 23d0d7cd..0ab805ec 100644 --- a/plugins/model/model.vcxproj +++ b/plugins/model/model.vcxproj @@ -21,11 +21,12 @@ {83C877DA-17B2-4863-B085-06AE9A8D68F3} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) model.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;%(AdditionalLibraryDirectories) model.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) model.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;picomodel.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;%(AdditionalLibraryDirectories) model.def true Windows diff --git a/plugins/shaders/shaders.vcxproj b/plugins/shaders/shaders.vcxproj index 6803a707..701d1697 100644 --- a/plugins/shaders/shaders.vcxproj +++ b/plugins/shaders/shaders.vcxproj @@ -21,11 +21,12 @@ {AEBCB950-AB67-48BB-9AF5-FCFB042824E8} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SHADERS_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) shaders.def true Windows diff --git a/plugins/spritemodel/spritemodel.vcxproj b/plugins/spritemodel/spritemodel.vcxproj index cfba7856..1e28a60f 100644 --- a/plugins/spritemodel/spritemodel.vcxproj +++ b/plugins/spritemodel/spritemodel.vcxproj @@ -21,11 +21,12 @@ {F291A09D-73BC-48FF-98EE-D672BBDE5C16} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SPRITEMODEL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) spritemodel.def true Windows diff --git a/plugins/surface/surface.vcxproj b/plugins/surface/surface.vcxproj index 1130263e..fbc6a6f2 100644 --- a/plugins/surface/surface.vcxproj +++ b/plugins/surface/surface.vcxproj @@ -21,11 +21,12 @@ {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface.def true Windows diff --git a/plugins/surface_idtech2/surface_idtech2.vcxproj b/plugins/surface_idtech2/surface_idtech2.vcxproj index 81caebec..a0d48a7a 100644 --- a/plugins/surface_idtech2/surface_idtech2.vcxproj +++ b/plugins/surface_idtech2/surface_idtech2.vcxproj @@ -21,11 +21,12 @@ {F400371F-455F-4B6C-9F13-A2E57110E725} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;SURFACE_IDTECH2_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) surface_idtech2.def true Windows diff --git a/plugins/textool/textool.vcxproj b/plugins/textool/textool.vcxproj index a38fb815..8737aa0c 100644 --- a/plugins/textool/textool.vcxproj +++ b/plugins/textool/textool.vcxproj @@ -21,11 +21,12 @@ {4F52DED4-285A-4E99-9C78-734D59E8ACD6} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;TEXTOOL_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;gtk-win32-2.0.lib;libxml2_a.lib;synapse.lib;mathlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) textool.def true Windows diff --git a/plugins/vfspak/vfspak.vcxproj b/plugins/vfspak/vfspak.vcxproj index 8bdedfd4..d87bf3d3 100644 --- a/plugins/vfspak/vfspak.vcxproj +++ b/plugins/vfspak/vfspak.vcxproj @@ -21,11 +21,12 @@ {8BE599BF-6318-4B0C-AC3E-DE811676C63B} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPAK_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspak.def true Windows diff --git a/plugins/vfspk3/vfspk3.vcxproj b/plugins/vfspk3/vfspk3.vcxproj index f4b91505..2195a14a 100644 --- a/plugins/vfspk3/vfspk3.vcxproj +++ b/plugins/vfspk3/vfspk3.vcxproj @@ -21,11 +21,12 @@ {DEFCF433-3A47-40EB-BBF7-861211C3A941} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfspk3.def true Windows diff --git a/plugins/vfsqlpk3/vfsqlpk3.vcxproj b/plugins/vfsqlpk3/vfsqlpk3.vcxproj index 7a985c81..842372a1 100644 --- a/plugins/vfsqlpk3/vfsqlpk3.vcxproj +++ b/plugins/vfsqlpk3/vfsqlpk3.vcxproj @@ -22,11 +22,12 @@ {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0} vfsqlpk3 Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -34,7 +35,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -72,7 +73,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -84,8 +85,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows @@ -95,7 +96,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -107,8 +108,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows @@ -116,7 +117,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -126,8 +127,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows @@ -138,7 +139,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSPK3_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -149,8 +150,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfsqlpk3.def true Windows diff --git a/plugins/vfswad/vfswad.vcxproj b/plugins/vfswad/vfswad.vcxproj index 3c994824..7e7a2d0f 100644 --- a/plugins/vfswad/vfswad.vcxproj +++ b/plugins/vfswad/vfswad.vcxproj @@ -21,11 +21,12 @@ {18116120-2710-4DD8-B1AC-940D0BDB36EF} Win32Proj + 8.1 DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -33,7 +34,7 @@ DynamicLibrary - v110_xp + v140 DynamicLibrary @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows @@ -94,7 +95,7 @@ Disabled - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,8 +107,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows @@ -115,7 +116,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -125,8 +126,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows @@ -137,7 +138,7 @@ - $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\libs;$(SolutionDir)\include;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;VFSWAD_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDLL @@ -148,8 +149,8 @@ /STACK:8388608 %(AdditionalOptions) - ws2_32.lib;glib-2.0.lib;libxml2.lib;synapse.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + ws2_32.lib;glib-2.0.lib;libxml2_a.lib;synapse.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) vfswad.def true Windows diff --git a/radiant/radiant.vcxproj b/radiant/radiant.vcxproj index c9a72baf..1dc2cb81 100644 --- a/radiant/radiant.vcxproj +++ b/radiant/radiant.vcxproj @@ -21,11 +21,12 @@ {65D02375-63EE-4A8A-9F8E-504B1D5A1D02} Win32Proj + 8.1 Application - v110_xp + v140 Application @@ -33,7 +34,7 @@ Application - v110_xp + v140 Application @@ -71,7 +72,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -83,8 +84,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -93,7 +94,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -105,15 +106,15 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -123,8 +124,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Windows true @@ -134,7 +135,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\STLport-5.2.1\stlport;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\gtk-2.0;$(SolutionDir)\..\gtk-2.24.10\include\cairo;$(SolutionDir)\..\gtk-2.24.10\include\pango-1.0;$(SolutionDir)\..\gtk-2.24.10\lib\gtk-2.0\include;$(SolutionDir)\..\gtk-2.24.10\include\atk-1.0;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\gtk-2.24.10\include\freetype2;$(SolutionDir)\..\gtkglext-1.2.0\include\gtkglext-1.0;$(SolutionDir)\..\gtkglext-1.2.0\lib\gtkglext-1.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -145,8 +146,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;gobject-2.0.lib;intl.lib;gtk-win32-2.0.lib;gdk-win32-2.0.lib;pango-1.0.lib;pangoft2-1.0.lib;gdkglext-win32-1.0.lib;gtkglext-win32-1.0.lib;libxml2_a.lib;mathlib.lib;synapse.lib;l_net.lib;cmdlib.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\gtkglext-1.2.0\lib;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Windows true diff --git a/tools/quake3/common/quake3-common.vcxproj b/tools/quake3/common/quake3-common.vcxproj index 7d2faa75..6953185e 100644 --- a/tools/quake3/common/quake3-common.vcxproj +++ b/tools/quake3/common/quake3-common.vcxproj @@ -21,11 +21,12 @@ {B99A58B4-E5AB-42F6-A28F-D7ACB80E0B06} Win32Proj + 8.1 StaticLibrary - v110_xp + v140 StaticLibrary @@ -33,7 +34,7 @@ StaticLibrary - v110_xp + v140 StaticLibrary @@ -75,7 +76,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true EnableFastChecks @@ -89,7 +90,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -102,7 +103,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL @@ -113,7 +114,7 @@ - $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\libs;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\jpeg-9;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/tools/quake3/q3data/q3data.vcxproj b/tools/quake3/q3data/q3data.vcxproj index 534b6b8a..913c4c4c 100644 --- a/tools/quake3/q3data/q3data.vcxproj +++ b/tools/quake3/q3data/q3data.vcxproj @@ -21,11 +21,12 @@ {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB} q3data + 8.1 Application - v110_xp + v140 MultiByte true @@ -37,7 +38,7 @@ Application - v110_xp + v140 MultiByte @@ -77,7 +78,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -87,8 +88,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true false @@ -98,7 +99,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -107,8 +108,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true false @@ -117,7 +118,7 @@ - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -125,8 +126,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true true true @@ -137,7 +138,7 @@ - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL Level3 @@ -145,8 +146,8 @@ 4996;4244;4267;%(DisableSpecificWarnings) - Ws2_32.lib;glib-2.0.lib;libxml2.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + Ws2_32.lib;glib-2.0.lib;libxml2_a.lib;l_net.lib;mathlib.lib;quake3-common.lib;%(AdditionalDependencies) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true true true diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index 0add46ac..30b2c33a 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -21,11 +21,12 @@ {CD40B764-1D47-4FAE-8C6A-EF036E478D65} Win32Proj + 8.1 Application - v110_xp + v140 Application @@ -33,7 +34,7 @@ Application - v110_xp + v140 Application @@ -77,7 +78,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks @@ -89,8 +90,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + 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.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console MachineX86 @@ -99,7 +100,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -111,15 +112,15 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.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.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories) + 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) true Console - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -129,8 +130,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + 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.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) true Console true @@ -140,7 +141,7 @@ - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.22.1_win64\include\glib-2.0;$(SolutionDir)\..\gtk-2.22.1_win64\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.22.1_win64\include\libpng14;$(SolutionDir)\..\gtk-2.22.1_win64\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -151,8 +152,8 @@ /STACK:8388608 %(AdditionalOptions) - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.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.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\$(Platform)\libs;%(AdditionalLibraryDirectories) + 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) true Console true diff --git a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj index 8c02e9b4..6e822f28 100644 --- a/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj +++ b/tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj @@ -21,11 +21,12 @@ {7AF7537E-94C3-4680-8F5E-C1CE30DC2041} q3map2 + 8.1 Application - v110_xp + v140 false MultiByte @@ -37,7 +38,7 @@ Application - v110_xp + v140 false MultiByte @@ -96,7 +97,7 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -115,10 +116,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + 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) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) .\Release/q3map2.pdb true .\Release/q3map2.map @@ -145,7 +146,7 @@ MaxSpeed OnlyExplicitInline - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -164,10 +165,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + 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) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) .\Release/q3map2.pdb true .\Release/q3map2.map @@ -193,7 +194,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDebugDLL @@ -211,10 +212,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + 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) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) libcd;libcmtd;%(IgnoreSpecificDefaultLibraries) true .\Debug/FS_q3map2_1.pdb @@ -242,7 +243,7 @@ Disabled - $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.1\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) + $(SolutionDir)\include;$(SolutionDir)\tools\quake3\common;$(SolutionDir)\libs;$(SolutionDir)\..\gtk-2.24.10\include\glib-2.0;$(SolutionDir)\..\gtk-2.24.10\include\gdk-pixbuf-2.0;$(SolutionDir)\..\gtk-2.24.10\lib\glib-2.0\include;$(SolutionDir)\..\libxml2-2.9.2\include;$(SolutionDir)\..\gtk-2.24.10\include\libpng14;$(SolutionDir)\..\gtk-2.24.10\include;$(SolutionDir)\..\jpeg-9;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) MultiThreadedDebugDLL .\Debug/q3map2.pch @@ -259,10 +260,10 @@ 0x0409 - Ws2_32.lib;glib-2.0.lib;libpng.lib;libxml2.lib;jpeg.lib;md5lib.lib;mathlib.lib;picomodel.lib;l_net.lib;ddslib.lib;quake3-common.lib;%(AdditionalDependencies) + 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) $(OutDir)$(ProjectName).exe true - $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.1\lib\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(SolutionDir)\..\gtk-2.24.10\lib;$(SolutionDir)\..\libxml2-2.9.2/win32/bin.msvc;$(SolutionDir)\..\jpeg-9\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) libcd;libcmtd;%(IgnoreSpecificDefaultLibraries) true .\Debug/FS_q3map2_1.pdb From 95186e4178a1a21a1d6ebbfaaa82a9f7f389a42d Mon Sep 17 00:00:00 2001 From: TTimo Date: Sun, 8 Nov 2015 00:01:10 -0600 Subject: [PATCH 08/18] updated support archives on S3 --- config.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/config.py b/config.py index ecf07b36..43269aef 100644 --- a/config.py +++ b/config.py @@ -283,10 +283,9 @@ class Config: if ( self.platform == 'Windows' ): backup_cwd = os.getcwd() for lib_archive in [ - 'STLport-5.2.1-GtkRadiant.zip', 'gtk-bundle-2.24.10-GtkRadiant.zip', 'gtk-bundle-2.22.1-win64-GtkRadiant.zip', - 'jpeg-9-GtkRadiant.zip', + 'jpeg-9-MSVC2014-GtkRadiant.zip', 'libxml2-2.9.2-GtkRadiant.zip', 'gtkglext-1.2.0-3-win32.zip', ]: From 7258ec33678fb3e62e9d64688667e4859fbbfd21 Mon Sep 17 00:00:00 2001 From: TTimo Date: Sun, 8 Nov 2015 16:34:59 -0600 Subject: [PATCH 09/18] go back to version 1.6.5 --- include/version.default | 2 +- include/version.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/version.default b/include/version.default index 4bffc9ea..42025646 100644 --- a/include/version.default +++ b/include/version.default @@ -1 +1 @@ -1.6.2 +1.6.5 diff --git a/include/version.h b/include/version.h index 4616a693..85372497 100644 --- a/include/version.h +++ b/include/version.h @@ -1,4 +1,4 @@ // generated header, see makeversion.py -#define RADIANT_VERSION "1.7.0" -#define RADIANT_MINOR_VERSION "0" -#define RADIANT_MAJOR_VERSION "7" +#define RADIANT_VERSION "1.6.5" +#define RADIANT_MINOR_VERSION "5" +#define RADIANT_MAJOR_VERSION "6" From 5debf960e3296a59ad521eb4605d8781eb8ab04e Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 8 Nov 2015 17:36:29 -0600 Subject: [PATCH 10/18] Include errno.h in plugins/vfspk3/vfs.cpp --- plugins/vfspk3/vfs.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp index 0654a656..c556d0a5 100644 --- a/plugins/vfspk3/vfs.cpp +++ b/plugins/vfspk3/vfs.cpp @@ -43,6 +43,7 @@ #include #include +#include #if defined ( __linux__ ) || defined ( __APPLE__ ) #include From 8d057ab8ea305127b3220eceee9518716c7f9324 Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Sun, 8 Nov 2015 17:38:23 -0600 Subject: [PATCH 11/18] Filter misc_model etc by eclass instead of each entity name This makes the recently added "misc_model_breakable" be filtered and removes the redundant list of model entity names. --- radiant/filters.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 ); From 3272dc14165d70e731ed0b9c65074e8546f23333 Mon Sep 17 00:00:00 2001 From: Timothee Besset Date: Thu, 24 Dec 2015 19:21:05 -0600 Subject: [PATCH 12/18] clone the bspc source --- config.py | 178 +++++++++++++++++++++++++++++------------------------- 1 file changed, 95 insertions(+), 83 deletions(-) diff --git a/config.py b/config.py index 43269aef..55cc88d0 100644 --- a/config.py +++ b/config.py @@ -281,90 +281,102 @@ 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' ): - backup_cwd = os.getcwd() - for lib_archive in [ - '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', - 'gtkglext-1.2.0-3-win32.zip', - ]: - if ( not os.path.exists( lib_archive ) ): - print( 'downloading %s' % lib_archive ) - archive_web_request = urllib2.urlopen( 'http://gtkradiant.s3-website-us-east-1.amazonaws.com/%s' % lib_archive ) - archive_File = open( lib_archive, 'wb' ) - while True: - data = archive_web_request.read( 1048576 ) # read 1mb at a time - if not data: - break - archive_File.write( data ) +# backup_cwd = os.getcwd() +# for lib_archive in [ +# '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', +# 'gtkglext-1.2.0-3-win32.zip', +# ]: +# if ( not os.path.exists( lib_archive ) ): +# print( 'downloading %s' % lib_archive ) +# archive_web_request = urllib2.urlopen( 'http://gtkradiant.s3-website-us-east-1.amazonaws.com/%s' % lib_archive ) +# archive_File = open( lib_archive, 'wb' ) +# while True: +# data = archive_web_request.read( 1048576 ) # read 1mb at a time +# if not data: +# break +# archive_File.write( data ) +# +# archive_web_request.close() +# archive_File.close() +# +# print( 'unpacking %s' % lib_archive ) +# lib_archive_path = os.path.abspath( lib_archive ) +# os.chdir( os.path.dirname( backup_cwd ) ) +# +# archive_Zip = zipfile.ZipFile( lib_archive_path, 'r' ) +# archive_Zip.extractall() +# archive_Zip.close() +# +# os.chdir( backup_cwd ) +# +# # copy all the dependent runtime data to the install directory +# srcdir = os.path.dirname( backup_cwd ) +# for dll in [ +# '%s/bin/freetype6.dll' % GTK_PREFIX, +# '%s/bin/intl.dll' % GTK_PREFIX, +# '%s/bin/libasprintf-0.dll' % GTK_PREFIX, +# '%s/bin/libatk-1.0-0.dll' % GTK_PREFIX, +# '%s/bin/libcairo-2.dll' % GTK_PREFIX, +# '%s/bin/libexpat-1.dll' % GTK_PREFIX, +# '%s/bin/libfontconfig-1.dll' % GTK_PREFIX, +# '%s/bin/libgailutil-18.dll' % GTK_PREFIX, +# '%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX, +# '%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libgio-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libglib-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX, +# '%s/bin/libpango-1.0-0.dll' % GTK_PREFIX, +# '%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX, +# '%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX, +# '%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX, +# '%s/bin/libpng14-14.dll' % GTK_PREFIX, +# '%s/bin/zlib1.dll' % GTK_PREFIX, +# '%s/lib/GNU.Gettext.dll' % GTK_PREFIX, +# '%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX, +# '%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX, +# '%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX, +# 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll', +# 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll', +# ]: +# shutil.copy( os.path.join( srcdir, dll ), 'install' ) +# +# for extra in [ +# '%s/etc' % GTK_PREFIX, +# '%s/share' % GTK_PREFIX, +# 'gtkglext-1.2.0/share', +# ]: +# self.CopyTree( os.path.join( srcdir, extra ), 'install' ) +# +# try: +# os.mkdir( 'install/x64' ) +# except: +# pass # assume 'already exists' +# for x64_dll in [ +# '%s/bin/libpng14-14.dll' % GTK64_PREFIX, +# '%s/bin/libglib-2.0-0.dll' % GTK64_PREFIX, +# '%s/bin/libintl-8.dll' % GTK64_PREFIX, +# '%s/bin/zlib1.dll' % GTK64_PREFIX, +# ]: +# shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' ) +# + self.CloneBSPC() - archive_web_request.close() - archive_File.close() - - print( 'unpacking %s' % lib_archive ) - lib_archive_path = os.path.abspath( lib_archive ) - os.chdir( os.path.dirname( backup_cwd ) ) - - archive_Zip = zipfile.ZipFile( lib_archive_path, 'r' ) - archive_Zip.extractall() - archive_Zip.close() - - os.chdir( backup_cwd ) - - # copy all the dependent runtime data to the install directory - srcdir = os.path.dirname( backup_cwd ) - for dll in [ - '%s/bin/freetype6.dll' % GTK_PREFIX, - '%s/bin/intl.dll' % GTK_PREFIX, - '%s/bin/libasprintf-0.dll' % GTK_PREFIX, - '%s/bin/libatk-1.0-0.dll' % GTK_PREFIX, - '%s/bin/libcairo-2.dll' % GTK_PREFIX, - '%s/bin/libexpat-1.dll' % GTK_PREFIX, - '%s/bin/libfontconfig-1.dll' % GTK_PREFIX, - '%s/bin/libgailutil-18.dll' % GTK_PREFIX, - '%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX, - '%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libgio-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libglib-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX, - '%s/bin/libpango-1.0-0.dll' % GTK_PREFIX, - '%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX, - '%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX, - '%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX, - '%s/bin/libpng14-14.dll' % GTK_PREFIX, - '%s/bin/zlib1.dll' % GTK_PREFIX, - '%s/lib/GNU.Gettext.dll' % GTK_PREFIX, - '%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX, - '%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX, - '%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX, - 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll', - 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll', - ]: - shutil.copy( os.path.join( srcdir, dll ), 'install' ) - - for extra in [ - '%s/etc' % GTK_PREFIX, - '%s/share' % GTK_PREFIX, - 'gtkglext-1.2.0/share', - ]: - self.CopyTree( os.path.join( srcdir, extra ), 'install' ) - - try: - os.mkdir( 'install/x64' ) - except: - pass # assume 'already exists' - for x64_dll in [ - '%s/bin/libpng14-14.dll' % GTK64_PREFIX, - '%s/bin/libglib-2.0-0.dll' % GTK64_PREFIX, - '%s/bin/libintl-8.dll' % GTK64_PREFIX, - '%s/bin/zlib1.dll' % GTK64_PREFIX, - ]: - shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' ) + 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' ) From 5ed4d02c78376d79a780ecb81677bb00291d93e2 Mon Sep 17 00:00:00 2001 From: Timothee Besset Date: Thu, 24 Dec 2015 19:21:23 -0600 Subject: [PATCH 13/18] more Visual Studio 2015 conversion --- contrib/bkgrnd2d/bkgrnd2d.vcxproj | 2 +- contrib/bobtoolz/bobtoolz.vcxproj | 2 +- contrib/camera/camera.vcxproj | 2 +- contrib/gtkgensurf/gtkgensurf.vcxproj | 2 +- contrib/hydratoolz/hydratoolz.vcxproj | 2 +- contrib/prtview/prtview.vcxproj | 2 +- libs/cmdlib/cmdlib.vcxproj | 2 +- libs/ddslib/ddslib.vcxproj | 2 +- libs/l_net/l_net.vcxproj | 2 +- libs/mathlib/mathlib.vcxproj | 2 +- libs/md5lib/md5lib.vcxproj | 2 +- libs/picomodel/picomodel.vcxproj | 2 +- libs/splines/splines.vcxproj | 2 +- libs/synapse/synapse.vcxproj | 2 +- plugins/eclassfgd/fgd.vcxproj | 2 +- plugins/entity/entity.vcxproj | 2 +- plugins/image/image.vcxproj | 2 +- plugins/imagehl/imagehl.vcxproj | 2 +- plugins/imagem8/imagem8.vcxproj | 2 +- plugins/imagepng/imagepng.vcxproj | 2 +- plugins/imagewal/imagewal.vcxproj | 2 +- plugins/map/map.vcxproj | 2 +- plugins/mapxml/mapxml.vcxproj | 2 +- plugins/model/model.vcxproj | 2 +- plugins/shaders/shaders.vcxproj | 2 +- plugins/spritemodel/spritemodel.vcxproj | 2 +- plugins/surface/surface.vcxproj | 2 +- plugins/surface_idtech2/surface_idtech2.vcxproj | 2 +- plugins/textool/textool.vcxproj | 2 +- plugins/vfspak/vfspak.vcxproj | 2 +- plugins/vfspk3/vfspk3.vcxproj | 2 +- plugins/vfsqlpk3/vfsqlpk3.vcxproj | 2 +- plugins/vfswad/vfswad.vcxproj | 2 +- radiant/radiant.vcxproj | 2 +- tools/quake3/common/quake3-common.vcxproj | 2 +- tools/quake3/q3data/q3data.vcxproj | 2 +- tools/quake3/q3map2/q3map2.vcxproj | 2 +- tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) 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/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/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.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index 30b2c33a..5b2a4d0d 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -30,7 +30,7 @@ Application - v110_xp + v140 Application 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 From ff0c4617f39f5b9012ab508f1739b12774f3092b Mon Sep 17 00:00:00 2001 From: Timothee Besset Date: Thu, 24 Dec 2015 19:27:46 -0600 Subject: [PATCH 14/18] oops left the other stuff turned off --- config.py | 170 +++++++++++++++++++++++++++--------------------------- 1 file changed, 85 insertions(+), 85 deletions(-) diff --git a/config.py b/config.py index 55cc88d0..8127d80e 100644 --- a/config.py +++ b/config.py @@ -281,91 +281,91 @@ 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' ): -# backup_cwd = os.getcwd() -# for lib_archive in [ -# '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', -# 'gtkglext-1.2.0-3-win32.zip', -# ]: -# if ( not os.path.exists( lib_archive ) ): -# print( 'downloading %s' % lib_archive ) -# archive_web_request = urllib2.urlopen( 'http://gtkradiant.s3-website-us-east-1.amazonaws.com/%s' % lib_archive ) -# archive_File = open( lib_archive, 'wb' ) -# while True: -# data = archive_web_request.read( 1048576 ) # read 1mb at a time -# if not data: -# break -# archive_File.write( data ) -# -# archive_web_request.close() -# archive_File.close() -# -# print( 'unpacking %s' % lib_archive ) -# lib_archive_path = os.path.abspath( lib_archive ) -# os.chdir( os.path.dirname( backup_cwd ) ) -# -# archive_Zip = zipfile.ZipFile( lib_archive_path, 'r' ) -# archive_Zip.extractall() -# archive_Zip.close() -# -# os.chdir( backup_cwd ) -# -# # copy all the dependent runtime data to the install directory -# srcdir = os.path.dirname( backup_cwd ) -# for dll in [ -# '%s/bin/freetype6.dll' % GTK_PREFIX, -# '%s/bin/intl.dll' % GTK_PREFIX, -# '%s/bin/libasprintf-0.dll' % GTK_PREFIX, -# '%s/bin/libatk-1.0-0.dll' % GTK_PREFIX, -# '%s/bin/libcairo-2.dll' % GTK_PREFIX, -# '%s/bin/libexpat-1.dll' % GTK_PREFIX, -# '%s/bin/libfontconfig-1.dll' % GTK_PREFIX, -# '%s/bin/libgailutil-18.dll' % GTK_PREFIX, -# '%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX, -# '%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libgio-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libglib-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX, -# '%s/bin/libpango-1.0-0.dll' % GTK_PREFIX, -# '%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX, -# '%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX, -# '%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX, -# '%s/bin/libpng14-14.dll' % GTK_PREFIX, -# '%s/bin/zlib1.dll' % GTK_PREFIX, -# '%s/lib/GNU.Gettext.dll' % GTK_PREFIX, -# '%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX, -# '%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX, -# '%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX, -# 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll', -# 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll', -# ]: -# shutil.copy( os.path.join( srcdir, dll ), 'install' ) -# -# for extra in [ -# '%s/etc' % GTK_PREFIX, -# '%s/share' % GTK_PREFIX, -# 'gtkglext-1.2.0/share', -# ]: -# self.CopyTree( os.path.join( srcdir, extra ), 'install' ) -# -# try: -# os.mkdir( 'install/x64' ) -# except: -# pass # assume 'already exists' -# for x64_dll in [ -# '%s/bin/libpng14-14.dll' % GTK64_PREFIX, -# '%s/bin/libglib-2.0-0.dll' % GTK64_PREFIX, -# '%s/bin/libintl-8.dll' % GTK64_PREFIX, -# '%s/bin/zlib1.dll' % GTK64_PREFIX, -# ]: -# shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' ) -# + backup_cwd = os.getcwd() + for lib_archive in [ + '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', + 'gtkglext-1.2.0-3-win32.zip', + ]: + if ( not os.path.exists( lib_archive ) ): + print( 'downloading %s' % lib_archive ) + archive_web_request = urllib2.urlopen( 'http://gtkradiant.s3-website-us-east-1.amazonaws.com/%s' % lib_archive ) + archive_File = open( lib_archive, 'wb' ) + while True: + data = archive_web_request.read( 1048576 ) # read 1mb at a time + if not data: + break + archive_File.write( data ) + + archive_web_request.close() + archive_File.close() + + print( 'unpacking %s' % lib_archive ) + lib_archive_path = os.path.abspath( lib_archive ) + os.chdir( os.path.dirname( backup_cwd ) ) + + archive_Zip = zipfile.ZipFile( lib_archive_path, 'r' ) + archive_Zip.extractall() + archive_Zip.close() + + os.chdir( backup_cwd ) + + # copy all the dependent runtime data to the install directory + srcdir = os.path.dirname( backup_cwd ) + for dll in [ + '%s/bin/freetype6.dll' % GTK_PREFIX, + '%s/bin/intl.dll' % GTK_PREFIX, + '%s/bin/libasprintf-0.dll' % GTK_PREFIX, + '%s/bin/libatk-1.0-0.dll' % GTK_PREFIX, + '%s/bin/libcairo-2.dll' % GTK_PREFIX, + '%s/bin/libexpat-1.dll' % GTK_PREFIX, + '%s/bin/libfontconfig-1.dll' % GTK_PREFIX, + '%s/bin/libgailutil-18.dll' % GTK_PREFIX, + '%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX, + '%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libgio-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libglib-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX, + '%s/bin/libpango-1.0-0.dll' % GTK_PREFIX, + '%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX, + '%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX, + '%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX, + '%s/bin/libpng14-14.dll' % GTK_PREFIX, + '%s/bin/zlib1.dll' % GTK_PREFIX, + '%s/lib/GNU.Gettext.dll' % GTK_PREFIX, + '%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX, + '%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX, + '%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX, + 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll', + 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll', + ]: + shutil.copy( os.path.join( srcdir, dll ), 'install' ) + + for extra in [ + '%s/etc' % GTK_PREFIX, + '%s/share' % GTK_PREFIX, + 'gtkglext-1.2.0/share', + ]: + self.CopyTree( os.path.join( srcdir, extra ), 'install' ) + + try: + os.mkdir( 'install/x64' ) + except: + pass # assume 'already exists' + for x64_dll in [ + '%s/bin/libpng14-14.dll' % GTK64_PREFIX, + '%s/bin/libglib-2.0-0.dll' % GTK64_PREFIX, + '%s/bin/libintl-8.dll' % GTK64_PREFIX, + '%s/bin/zlib1.dll' % GTK64_PREFIX, + ]: + shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' ) + self.CloneBSPC() def CloneBSPC( self ): From 4e08b4bd492a83c5b74cf70ba3a8553b4c104be0 Mon Sep 17 00:00:00 2001 From: Timothee Besset Date: Thu, 24 Dec 2015 22:31:49 -0600 Subject: [PATCH 15/18] compile x64 q3map2 against new libxml2 x64 lib folder --- tools/quake3/q3map2/q3map2.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index 5b2a4d0d..a408eed6 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -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 From d2c940a69401665a4ca4c7a5a4b492d7cb4dcbac Mon Sep 17 00:00:00 2001 From: Timothee Besset Date: Thu, 24 Dec 2015 22:35:15 -0600 Subject: [PATCH 16/18] pull the new file --- config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py b/config.py index 8127d80e..1f15d79d 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 ) ): From 9a169784d2fdcb504917b825acb8fb588d0a47e3 Mon Sep 17 00:00:00 2001 From: TTimo Date: Sun, 10 Jan 2016 11:20:02 -0600 Subject: [PATCH 17/18] at some point libpng stopped being a dep of image.so? --- config.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config.py b/config.py index 1f15d79d..10d3ed7e 100644 --- a/config.py +++ b/config.py @@ -395,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 ) ) From eb40681f0a6a224d808de36f0b045c91f796c25b Mon Sep 17 00:00:00 2001 From: TTimo Date: Sun, 10 Jan 2016 11:20:13 -0600 Subject: [PATCH 18/18] reduce warning spam --- include/stl_check.h | 3 +++ 1 file changed, 3 insertions(+) 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