diff --git a/code/botlib/botlib.vcproj b/code/win32/msvc/botlib.vcproj similarity index 85% rename from code/botlib/botlib.vcproj rename to code/win32/msvc/botlib.vcproj index 00e57049..f5cd4ab9 100644 --- a/code/botlib/botlib.vcproj +++ b/code/win32/msvc/botlib.vcproj @@ -3,8 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="botlib" - SccProjectName=""$/MissionPack/code/botlib", HBAAAAAA" - SccLocalPath="."> + ProjectGUID="{A410161F-AE9F-485D-A01F-5294891430A6}"> @@ -12,8 +11,8 @@ @@ -63,8 +62,8 @@ @@ -114,8 +113,8 @@ @@ -166,8 +165,8 @@ @@ -217,8 +217,8 @@ @@ -274,7 +274,7 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + RelativePath="..\..\botlib\be_aas_bspq3.c"> + RelativePath="..\..\botlib\be_aas_cluster.c"> + RelativePath="..\..\botlib\be_aas_debug.c"> + RelativePath="..\..\botlib\be_aas_entity.c"> + RelativePath="..\..\botlib\be_aas_file.c"> + RelativePath="..\..\botlib\be_aas_main.c"> + RelativePath="..\..\botlib\be_aas_move.c"> + RelativePath="..\..\botlib\be_aas_optimize.c"> + RelativePath="..\..\botlib\be_aas_reach.c"> + RelativePath="..\..\botlib\be_aas_route.c"> + RelativePath="..\..\botlib\be_aas_routealt.c"> + RelativePath="..\..\botlib\be_aas_sample.c"> + RelativePath="..\..\botlib\be_ai_char.c"> + RelativePath="..\..\botlib\be_ai_chat.c"> + RelativePath="..\..\botlib\be_ai_gen.c"> + RelativePath="..\..\botlib\be_ai_goal.c"> + RelativePath="..\..\botlib\be_ai_move.c"> + RelativePath="..\..\botlib\be_ai_weap.c"> + RelativePath="..\..\botlib\be_ai_weight.c"> + RelativePath="..\..\botlib\be_ea.c"> + RelativePath="..\..\botlib\be_interface.c"> + RelativePath="..\..\botlib\l_crc.c"> + RelativePath="..\..\botlib\l_libvar.c"> + RelativePath="..\..\botlib\l_log.c"> + RelativePath="..\..\botlib\l_memory.c"> + RelativePath="..\..\botlib\l_precomp.c"> + RelativePath="..\..\botlib\l_script.c"> + RelativePath="..\..\botlib\l_struct.c"> + RelativePath="..\..\botlib\aasfile.h"> + RelativePath="..\..\botlib\be_aas_bsp.h"> + RelativePath="..\..\botlib\be_aas_cluster.h"> + RelativePath="..\..\botlib\be_aas_debug.h"> + RelativePath="..\..\botlib\be_aas_def.h"> + RelativePath="..\..\botlib\be_aas_entity.h"> + RelativePath="..\..\botlib\be_aas_file.h"> + RelativePath="..\..\botlib\be_aas_funcs.h"> + RelativePath="..\..\botlib\be_aas_main.h"> + RelativePath="..\..\botlib\be_aas_move.h"> + RelativePath="..\..\botlib\be_aas_optimize.h"> + RelativePath="..\..\botlib\be_aas_reach.h"> + RelativePath="..\..\botlib\be_aas_route.h"> + RelativePath="..\..\botlib\be_aas_routealt.h"> + RelativePath="..\..\botlib\be_aas_sample.h"> + RelativePath="..\..\botlib\be_ai_weight.h"> + RelativePath="..\..\botlib\be_interface.h"> + RelativePath="..\..\game\bg_public.h"> + RelativePath="..\..\qcommon\cm_public.h"> + RelativePath="..\\..\game\g_public.h"> + RelativePath="..\..\botlib\l_crc.h"> + RelativePath="..\..\botlib\l_libvar.h"> + RelativePath="..\..\botlib\l_log.h"> + RelativePath="..\..\botlib\l_memory.h"> + RelativePath="..\..\botlib\l_precomp.h"> + RelativePath="..\..\botlib\l_script.h"> + RelativePath="..\..\botlib\l_struct.h"> + RelativePath="..\..\botlib\l_utils.h"> + RelativePath="..\..\qcommon\q_shared.h"> + RelativePath="..\..\qcommon\qcommon.h"> + RelativePath="..\..\qcommon\qfiles.h"> + RelativePath="..\\..\server\server.h"> + RelativePath="..\..\qcommon\surfaceflags.h"> diff --git a/code/cgame/cgame.def b/code/win32/msvc/cgame.def similarity index 100% rename from code/cgame/cgame.def rename to code/win32/msvc/cgame.def diff --git a/code/cgame/cgame.vcproj b/code/win32/msvc/cgame.vcproj similarity index 87% rename from code/cgame/cgame.vcproj rename to code/win32/msvc/cgame.vcproj index 851ac1da..514bf8cc 100644 --- a/code/cgame/cgame.vcproj +++ b/code/win32/msvc/cgame.vcproj @@ -3,8 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="cgame" - SccProjectName=""$/MissionPack/code/cgame", NPAAAAAA" - SccLocalPath="."> + ProjectGUID="{C878E295-CB82-4B40-8ECF-5CE5525466FA}"> @@ -12,8 +11,8 @@ @@ -27,10 +26,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Release_TA/cgame.pch" - AssemblerListingLocation=".\Release_TA/" - ObjectFile=".\Release_TA/" - ProgramDataBaseFileName=".\Release_TA/" + PrecompiledHeaderFile="$(IntDir)\cgame.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="4" SuppressStartupBanner="TRUE"/> @@ -80,8 +79,8 @@ @@ -92,10 +91,10 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Debug/cgame.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="$(IntDir)\cgame.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -105,17 +104,17 @@ @@ -163,10 +162,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Release/cgame.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="$(IntDir)\cgame.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="4" SuppressStartupBanner="TRUE"/> @@ -228,10 +227,10 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;MISSIONPACK" RuntimeLibrary="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Debug_TA/cgame.pch" - AssemblerListingLocation=".\Debug_TA/" - ObjectFile=".\Debug_TA/" - ProgramDataBaseFileName=".\Debug_TA/" + PrecompiledHeaderFile="$(IntDir)\cgame.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -241,17 +240,17 @@ + RelativePath="..\..\game\bg_lib.c"> @@ -327,7 +326,7 @@ + RelativePath="..\..\game\bg_misc.c"> + RelativePath="..\..\game\bg_pmove.c"> + RelativePath="..\..\game\bg_slidemove.c"> + RelativePath="..\..\cgame\cg_consolecmds.c"> + RelativePath="..\..\cgame\cg_draw.c"> + RelativePath="..\..\cgame\cg_drawtools.c"> + RelativePath="..\..\cgame\cg_effects.c"> + RelativePath="..\..\cgame\cg_ents.c"> + RelativePath="..\..\cgame\cg_event.c"> + RelativePath="..\..\cgame\cg_info.c"> + RelativePath="..\..\cgame\cg_localents.c"> + RelativePath="..\..\cgame\cg_main.c"> + RelativePath="..\..\cgame\cg_marks.c"> + RelativePath="..\..\cgame\cg_newDraw.c"> + RelativePath="..\..\cgame\cg_players.c"> + RelativePath="..\..\cgame\cg_playerstate.c"> + RelativePath="..\..\cgame\cg_predict.c"> + RelativePath="..\..\cgame\cg_scoreboard.c"> + RelativePath="..\..\cgame\cg_servercmds.c"> + RelativePath="..\..\cgame\cg_snapshot.c"> + RelativePath="..\..\cgame\cg_syscalls.c"> + RelativePath="..\..\cgame\cg_view.c"> + RelativePath="..\..\cgame\cg_weapons.c"> + RelativePath="..\..\qcommon\q_math.c"> + RelativePath="..\..\qcommon\q_shared.c"> + RelativePath="..\..\ui\ui_shared.c"> + RelativePath="..\..\game\bg_public.h"> + RelativePath="..\..\cgame\cg_local.h"> + RelativePath="..\..\cgame\cg_public.h"> + RelativePath="..\..\qcommon\q_shared.h"> + RelativePath="..\..\qcommon\surfaceflags.h"> + RelativePath="..\..\cgame\cgame.def"> diff --git a/code/game/game.def b/code/win32/msvc/game.def similarity index 100% rename from code/game/game.def rename to code/win32/msvc/game.def diff --git a/code/game/game.vcproj b/code/win32/msvc/game.vcproj similarity index 88% rename from code/game/game.vcproj rename to code/win32/msvc/game.vcproj index cd0efb26..27069af7 100644 --- a/code/game/game.vcproj +++ b/code/win32/msvc/game.vcproj @@ -3,8 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="game" - SccProjectName=""$/MissionPack/code/game", CYAAAAAA" - SccLocalPath="."> + ProjectGUID="{F9EE10DA-2404-4154-B904-F93C936C040A}"> @@ -12,8 +11,8 @@ @@ -24,10 +23,10 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;MISSIONPACK;QAGAME" RuntimeLibrary="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Debug_TA/game.pch" - AssemblerListingLocation=".\Debug_TA/" - ObjectFile=".\Debug_TA/" - ProgramDataBaseFileName=".\Debug_TA/" + PrecompiledHeaderFile="$(IntDir)\game.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -37,17 +36,17 @@ @@ -92,10 +91,10 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;BUILDING_REF_GL;DEBUG;GLOBALRANK" RuntimeLibrary="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Debug/game.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="$(IntDir)\game.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -105,17 +104,17 @@ @@ -163,10 +162,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\ReleaseAXP/game.pch" - AssemblerListingLocation=".\ReleaseAXP/" - ObjectFile=".\ReleaseAXP/" - ProgramDataBaseFileName=".\ReleaseAXP/" + PrecompiledHeaderFile="$(IntDir)\game.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="2"/> @@ -175,14 +174,14 @@ + ImportLibrary="$(IntDir)\qagameaxp.lib"/> @@ -226,10 +225,10 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;C_ONLY" RuntimeLibrary="5" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\DebugAxp/game.pch" - AssemblerListingLocation=".\DebugAxp/" - ObjectFile=".\DebugAxp/" - ProgramDataBaseFileName=".\DebugAxp/" + PrecompiledHeaderFile="$(IntDir)\game.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="3"/> @@ -238,15 +237,15 @@ + ImportLibrary="$(IntDir)\qagameaxp.lib"/> @@ -293,10 +292,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Release/game.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="$(IntDir)\game.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="4" SuppressStartupBanner="TRUE"/> @@ -361,10 +360,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Release_TA/game.pch" - AssemblerListingLocation=".\Release_TA/" - ObjectFile=".\Release_TA/" - ProgramDataBaseFileName=".\Release_TA/" + PrecompiledHeaderFile="$(IntDir)\game.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="4" SuppressStartupBanner="TRUE"/> + RelativePath="..\..\game\ai_chat.c"> + RelativePath="..\..\game\ai_cmd.c"> + RelativePath="..\..\game\ai_dmnet.c"> + RelativePath="..\..\game\ai_dmq3.c"> + RelativePath="..\..\game\ai_main.c"> + RelativePath="..\..\game\ai_team.c"> + RelativePath="..\..\game\ai_vcmd.c"> + RelativePath="..\..\game\bg_lib.c"> @@ -800,7 +799,7 @@ + RelativePath="..\..\game\bg_misc.c"> + RelativePath="..\..\game\bg_pmove.c"> + RelativePath="..\..\game\bg_slidemove.c"> + RelativePath="..\..\game\g_active.c"> + RelativePath="..\..\game\g_arenas.c"> + RelativePath="..\..\game\g_bot.c"> + RelativePath="..\..\game\g_client.c"> + RelativePath="..\..\game\g_cmds.c"> + RelativePath="..\..\game\g_combat.c"> + RelativePath="..\..\game\g_items.c"> + RelativePath="..\..\game\g_main.c"> + RelativePath="..\..\game\g_mem.c"> + RelativePath="..\..\game\g_misc.c"> + RelativePath="..\..\game\g_missile.c"> + RelativePath="..\..\game\g_mover.c"> + RelativePath="..\..\game\g_session.c"> + RelativePath="..\..\game\g_spawn.c"> + RelativePath="..\..\game\g_svcmds.c"> + RelativePath="..\..\game\g_syscalls.c"> + RelativePath="..\..\game\g_target.c"> + RelativePath="..\..\game\g_team.c"> + RelativePath="..\..\game\g_trigger.c"> + RelativePath="..\..\game\g_utils.c"> + RelativePath="..\..\game\g_weapon.c"> + RelativePath="..\..\game\game.def"> @@ -1943,95 +1942,95 @@ + RelativePath="..\..\qcommon\q_math.c"> + RelativePath="..\..\qcommon\q_shared.c"> + RelativePath="..\..\game\ai_chat.h"> + RelativePath="..\..\game\ai_cmd.h"> + RelativePath="..\..\game\ai_dmnet.h"> + RelativePath="..\..\game\ai_dmq3.h"> + RelativePath="..\..\game\ai_main.h"> + RelativePath="..\..\game\ai_team.h"> + RelativePath="..\..\game\ai_vcmd.h"> + RelativePath="..\..\game\be_aas.h"> + RelativePath="..\..\game\be_ai_char.h"> + RelativePath="..\..\game\be_ai_chat.h"> + RelativePath="..\..\game\be_ai_gen.h"> + RelativePath="..\..\game\be_ai_goal.h"> + RelativePath="..\..\game\be_ai_move.h"> + RelativePath="..\..\game\be_ai_weap.h"> + RelativePath="..\..\game\be_ea.h"> + RelativePath="..\..\game\bg_local.h"> + RelativePath="..\..\game\bg_public.h"> + RelativePath="..\..\game\botlib.h"> + RelativePath="..\..\game\chars.h"> + RelativePath="..\..\game\g_local.h"> + RelativePath="..\..\game\g_public.h"> + RelativePath="..\..\game\g_team.h"> + RelativePath="..\..\game\inv.h"> + RelativePath="..\..\game\match.h"> + RelativePath="..\..\qcommon\q_shared.h"> + RelativePath="..\..\qcommon\surfaceflags.h"> + RelativePath="..\..\game\syn.h"> + ProjectGUID="{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}"> @@ -12,8 +11,8 @@ + RelativePath="..\..\game\bg_misc.c"> @@ -320,13 +320,13 @@ + RelativePath="..\..\qcommon\q_math.c"> + RelativePath="..\..\qcommon\q_shared.c"> + RelativePath="..\..\q3_ui\ui.def"> @@ -347,7 +347,7 @@ + RelativePath="..\..\q3_ui\ui_addbots.c"> @@ -384,7 +384,7 @@ + RelativePath="..\..\q3_ui\ui_atoms.c"> @@ -421,7 +421,7 @@ + RelativePath="..\..\q3_ui\ui_cdkey.c"> @@ -458,7 +458,7 @@ + RelativePath="..\..\q3_ui\ui_cinematics.c"> @@ -495,7 +495,7 @@ + RelativePath="..\..\q3_ui\ui_confirm.c"> @@ -532,7 +532,7 @@ + RelativePath="..\..\q3_ui\ui_connect.c"> @@ -569,7 +569,7 @@ + RelativePath="..\..\q3_ui\ui_controls2.c"> @@ -606,7 +606,7 @@ + RelativePath="..\..\q3_ui\ui_credits.c"> @@ -643,7 +643,7 @@ + RelativePath="..\..\q3_ui\ui_demo2.c"> @@ -680,7 +680,7 @@ + RelativePath="..\..\q3_ui\ui_display.c"> @@ -717,7 +717,7 @@ + RelativePath="..\..\q3_ui\ui_gameinfo.c"> @@ -754,7 +754,7 @@ + RelativePath="..\..\q3_ui\ui_ingame.c"> @@ -791,7 +791,7 @@ + RelativePath="..\..\q3_ui\ui_loadconfig.c"> @@ -830,7 +830,7 @@ + RelativePath="..\..\q3_ui\ui_main.c"> @@ -867,7 +867,7 @@ + RelativePath="..\..\q3_ui\ui_menu.c"> @@ -904,7 +904,7 @@ + RelativePath="..\..\q3_ui\ui_mfield.c"> @@ -941,7 +941,7 @@ + RelativePath="..\..\q3_ui\ui_mods.c"> @@ -978,7 +978,7 @@ + RelativePath="..\..\q3_ui\ui_network.c"> @@ -1015,7 +1015,7 @@ + RelativePath="..\..\q3_ui\ui_options.c"> @@ -1052,7 +1052,7 @@ + RelativePath="..\..\q3_ui\ui_playermodel.c"> @@ -1089,7 +1089,7 @@ + RelativePath="..\..\q3_ui\ui_players.c"> @@ -1126,7 +1126,7 @@ + RelativePath="..\..\q3_ui\ui_playersettings.c"> @@ -1163,7 +1163,7 @@ + RelativePath="..\..\q3_ui\ui_preferences.c"> @@ -1200,7 +1200,7 @@ + RelativePath="..\..\q3_ui\ui_qmenu.c"> @@ -1237,7 +1237,7 @@ + RelativePath="..\..\q3_ui\ui_removebots.c"> @@ -1274,7 +1274,7 @@ + RelativePath="..\..\q3_ui\ui_saveconfig.c"> @@ -1313,7 +1313,7 @@ + RelativePath="..\..\q3_ui\ui_serverinfo.c"> @@ -1350,7 +1350,7 @@ + RelativePath="..\..\q3_ui\ui_servers2.c"> @@ -1387,7 +1387,7 @@ + RelativePath="..\..\q3_ui\ui_setup.c"> @@ -1424,7 +1424,7 @@ + RelativePath="..\..\q3_ui\ui_sound.c"> @@ -1461,7 +1461,7 @@ + RelativePath="..\..\q3_ui\ui_sparena.c"> @@ -1498,7 +1498,7 @@ + RelativePath="..\..\q3_ui\ui_specifyserver.c"> @@ -1535,7 +1535,7 @@ + RelativePath="..\..\q3_ui\ui_splevel.c"> @@ -1572,7 +1572,7 @@ + RelativePath="..\..\q3_ui\ui_sppostgame.c"> @@ -1609,7 +1609,7 @@ + RelativePath="..\..\q3_ui\ui_spreset.c"> @@ -1646,7 +1646,7 @@ + RelativePath="..\..\q3_ui\ui_spskill.c"> @@ -1683,7 +1683,7 @@ + RelativePath="..\..\q3_ui\ui_startserver.c"> @@ -1720,7 +1720,7 @@ + RelativePath="..\..\ui\ui_syscalls.c"> + RelativePath="..\..\q3_ui\ui_team.c"> @@ -1792,7 +1792,7 @@ + RelativePath="..\..\q3_ui\ui_teamorders.c"> @@ -1829,7 +1829,7 @@ + RelativePath="..\..\q3_ui\ui_video.c"> @@ -1870,7 +1870,7 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl"> + RelativePath="..\..\q3_ui\keycodes.h"> @@ -1885,10 +1885,10 @@ + RelativePath="..\..\qcommon\q_shared.h"> + RelativePath="..\..\q3_ui\ui_local.h"> @@ -1903,7 +1903,7 @@ + RelativePath="..\..\q3_ui\ui_public.h"> diff --git a/code/quake3.sln b/code/win32/msvc/quake3.sln similarity index 65% rename from code/quake3.sln rename to code/win32/msvc/quake3.sln index 845e123e..1d557909 100644 --- a/code/quake3.sln +++ b/code/win32/msvc/quake3.sln @@ -1,145 +1,97 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Splines", "splines\Splines.vcproj", "{DBAF2C53-3858-455D-A1AE-3FC093515314}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botlib", "botlib\botlib.vcproj", "{A410161F-AE9F-485D-A01F-5294891430A6}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame\cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game\game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui\q3_ui.vcproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}" - ProjectSection(ProjectDependencies) = postProject - {A410161F-AE9F-485D-A01F-5294891430A6} = {A410161F-AE9F-485D-A01F-5294891430A6} - {DBAF2C53-3858-455D-A1AE-3FC093515314} = {DBAF2C53-3858-455D-A1AE-3FC093515314} - {AB424155-FBED-4D8D-B007-5B6CF93EA395} = {AB424155-FBED-4D8D-B007-5B6CF93EA395} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\renderer.vcproj", "{AB424155-FBED-4D8D-B007-5B6CF93EA395}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui\ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SourceCodeControl) = preSolution - SccNumberOfProjects = 8 - SccProjectUniqueName0 = splines\\Splines.vcproj - SccProjectName0 = \u0022$/MissionPack/code/Splines\u0022,\u0020WJNAAAAA - SccLocalPath0 = splines - SccProvider0 = MSSCCI:Perforce\u0020SCM - SccProjectUniqueName1 = botlib\\botlib.vcproj - SccProjectName1 = \u0022$/MissionPack/code/botlib\u0022,\u0020HBAAAAAA - SccLocalPath1 = botlib - SccProvider1 = MSSCCI:Perforce\u0020SCM - SccProjectUniqueName2 = cgame\\cgame.vcproj - SccProjectName2 = \u0022$/MissionPack/code/cgame\u0022,\u0020NPAAAAAA - SccLocalPath2 = cgame - SccProvider2 = MSSCCI:Perforce\u0020SCM - SccProjectUniqueName3 = game\\game.vcproj - SccProjectName3 = \u0022$/MissionPack/code/game\u0022,\u0020CYAAAAAA - SccLocalPath3 = game - SccProvider3 = MSSCCI:Perforce\u0020SCM - SccProjectUniqueName4 = q3_ui\\q3_ui.vcproj - SccProjectName4 = \u0022$/MissionPack/code/q3_ui\u0022,\u0020VFLAAAAA - SccLocalPath4 = q3_ui - SccProvider4 = MSSCCI:Perforce\u0020SCM - SccProjectUniqueName5 = quake3.vcproj - SccProjectName5 = \u0022$/MissionPack/code\u0022,\u0020CAAAAAAA - SccLocalPath5 = . - SccProvider5 = MSSCCI:Perforce\u0020SCM - SccProjectUniqueName6 = renderer\\renderer.vcproj - SccProjectName6 = \u0022$/MissionPack/code/renderer\u0022,\u0020EJBAAAAA - SccLocalPath6 = renderer - SccProvider6 = MSSCCI:Perforce\u0020SCM - SccProjectUniqueName7 = ui\\ui.vcproj - SccProjectName7 = \u0022$/MissionPack/code/ui\u0022,\u0020AOBAAAAA - SccLocalPath7 = ui - SccProvider7 = MSSCCI:Perforce\u0020SCM - EndGlobalSection - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Debug TA = Debug TA - Release = Release - Release TA = Release TA - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug.ActiveCfg = Debug|Win32 - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug.Build.0 = Debug|Win32 - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug TA.ActiveCfg = Debug|Win32 - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Debug TA.Build.0 = Debug|Win32 - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Release.ActiveCfg = Release|Win32 - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Release.Build.0 = Release|Win32 - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Release TA.ActiveCfg = Release|Win32 - {DBAF2C53-3858-455D-A1AE-3FC093515314}.Release TA.Build.0 = Release|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Debug.ActiveCfg = Debug|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Debug.Build.0 = Debug|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Debug TA.ActiveCfg = Debug TA|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Debug TA.Build.0 = Debug TA|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Release.ActiveCfg = Release|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Release.Build.0 = Release|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Release TA.ActiveCfg = Release TA|Win32 - {A410161F-AE9F-485D-A01F-5294891430A6}.Release TA.Build.0 = Release TA|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug.ActiveCfg = Debug|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug.Build.0 = Debug|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA.ActiveCfg = Debug TA|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA.Build.0 = Debug TA|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release.ActiveCfg = Release|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release.Build.0 = Release|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA.ActiveCfg = Release TA|Win32 - {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA.Build.0 = Release TA|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug.ActiveCfg = Debug|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug.Build.0 = Debug|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA.ActiveCfg = Debug TA|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA.Build.0 = Debug TA|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Release.ActiveCfg = Release|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Release.Build.0 = Release|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA.ActiveCfg = Release TA|Win32 - {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA.Build.0 = Release TA|Win32 - {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug.ActiveCfg = Debug|Win32 - {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug.Build.0 = Debug|Win32 - {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA.ActiveCfg = Debug TA|Win32 - {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release.ActiveCfg = Release|Win32 - {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release.Build.0 = Release|Win32 - {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA.ActiveCfg = Release TA|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug.ActiveCfg = Debug|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug.Build.0 = Debug|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA.ActiveCfg = Debug TA|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA.Build.0 = Debug TA|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release.ActiveCfg = Release|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release.Build.0 = Release|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA.ActiveCfg = Release TA|Win32 - {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA.Build.0 = Release TA|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug.ActiveCfg = Debug|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug.Build.0 = Debug|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug TA.ActiveCfg = Debug TA|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug TA.Build.0 = Debug TA|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release.ActiveCfg = Release|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release.Build.0 = Release|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release TA.ActiveCfg = Release TA|Win32 - {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release TA.Build.0 = Release TA|Win32 - {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug.ActiveCfg = Debug|Win32 - {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA.ActiveCfg = Debug TA|Win32 - {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA.Build.0 = Debug TA|Win32 - {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release.ActiveCfg = Release|Win32 - {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA.ActiveCfg = Release TA|Win32 - {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA.Build.0 = Release TA|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "botlib", "botlib.vcproj", "{A410161F-AE9F-485D-A01F-5294891430A6}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cgame", "cgame.vcproj", "{C878E295-CB82-4B40-8ECF-5CE5525466FA}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "game", "game.vcproj", "{F9EE10DA-2404-4154-B904-F93C936C040A}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "q3_ui", "q3_ui.vcproj", "{D454C4C7-7765-4149-ABAD-05FDEB9D94F8}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quake3", "quake3.vcproj", "{81CB51C4-B434-4E12-B69B-BAEE102F2852}" + ProjectSection(ProjectDependencies) = postProject + {A410161F-AE9F-485D-A01F-5294891430A6} = {A410161F-AE9F-485D-A01F-5294891430A6} + {AB424155-FBED-4D8D-B007-5B6CF93EA395} = {AB424155-FBED-4D8D-B007-5B6CF93EA395} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcproj", "{AB424155-FBED-4D8D-B007-5B6CF93EA395}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ui", "ui.vcproj", "{A8EAC38E-C7DA-42F8-811D-77FD092B9D19}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Debug TA = Debug TA + Release = Release + Release TA = Release TA + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {A410161F-AE9F-485D-A01F-5294891430A6}.Debug.ActiveCfg = Debug|Win32 + {A410161F-AE9F-485D-A01F-5294891430A6}.Debug.Build.0 = Debug|Win32 + {A410161F-AE9F-485D-A01F-5294891430A6}.Debug TA.ActiveCfg = Debug TA|Win32 + {A410161F-AE9F-485D-A01F-5294891430A6}.Debug TA.Build.0 = Debug TA|Win32 + {A410161F-AE9F-485D-A01F-5294891430A6}.Release.ActiveCfg = Release|Win32 + {A410161F-AE9F-485D-A01F-5294891430A6}.Release.Build.0 = Release|Win32 + {A410161F-AE9F-485D-A01F-5294891430A6}.Release TA.ActiveCfg = Release TA|Win32 + {A410161F-AE9F-485D-A01F-5294891430A6}.Release TA.Build.0 = Release TA|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug.ActiveCfg = Debug|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug.Build.0 = Debug|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA.ActiveCfg = Debug TA|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Debug TA.Build.0 = Debug TA|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release.ActiveCfg = Release|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release.Build.0 = Release|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA.ActiveCfg = Release TA|Win32 + {C878E295-CB82-4B40-8ECF-5CE5525466FA}.Release TA.Build.0 = Release TA|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug.ActiveCfg = Debug|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug.Build.0 = Debug|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA.ActiveCfg = Debug TA|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Debug TA.Build.0 = Debug TA|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Release.ActiveCfg = Release|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Release.Build.0 = Release|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA.ActiveCfg = Release TA|Win32 + {F9EE10DA-2404-4154-B904-F93C936C040A}.Release TA.Build.0 = Release TA|Win32 + {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug.ActiveCfg = Debug|Win32 + {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug.Build.0 = Debug|Win32 + {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Debug TA.ActiveCfg = Debug TA|Win32 + {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release.ActiveCfg = Release|Win32 + {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release.Build.0 = Release|Win32 + {D454C4C7-7765-4149-ABAD-05FDEB9D94F8}.Release TA.ActiveCfg = Release TA|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug.ActiveCfg = Debug|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug.Build.0 = Debug|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA.ActiveCfg = Debug TA|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Debug TA.Build.0 = Debug TA|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release.ActiveCfg = Release|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release.Build.0 = Release|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA.ActiveCfg = Release TA|Win32 + {81CB51C4-B434-4E12-B69B-BAEE102F2852}.Release TA.Build.0 = Release TA|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug.ActiveCfg = Debug|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug.Build.0 = Debug|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug TA.ActiveCfg = Debug TA|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Debug TA.Build.0 = Debug TA|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release.ActiveCfg = Release|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release.Build.0 = Release|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release TA.ActiveCfg = Release TA|Win32 + {AB424155-FBED-4D8D-B007-5B6CF93EA395}.Release TA.Build.0 = Release TA|Win32 + {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug.ActiveCfg = Debug|Win32 + {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA.ActiveCfg = Debug TA|Win32 + {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Debug TA.Build.0 = Debug TA|Win32 + {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release.ActiveCfg = Release|Win32 + {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA.ActiveCfg = Release TA|Win32 + {A8EAC38E-C7DA-42F8-811D-77FD092B9D19}.Release TA.Build.0 = Release TA|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/code/quake3.vcproj b/code/win32/msvc/quake3.vcproj similarity index 88% rename from code/quake3.vcproj rename to code/win32/msvc/quake3.vcproj index 904e5264..01d3a405 100644 --- a/code/quake3.vcproj +++ b/code/win32/msvc/quake3.vcproj @@ -3,10 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="quake3" - SccProjectName=""$/MissionPack/code", CAAAAAAA" - SccAuxPath="" - SccLocalPath="." - SccProvider="MSSCCI:Perforce SCM"> + ProjectGUID="{81CB51C4-B434-4E12-B69B-BAEE102F2852}"> @@ -14,8 +11,8 @@ @@ -29,10 +26,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Release_TA/quake3.pch" - AssemblerListingLocation=".\Release_TA/" - ObjectFile=".\Release_TA/" - ProgramDataBaseFileName=".\Release_TA/" + PrecompiledHeaderFile="$(IntDir)\quake3.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" WarningLevel="4" SuppressStartupBanner="TRUE"/> @@ -41,12 +38,12 @@ @@ -56,7 +53,7 @@ MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" - TypeLibraryName=".\Release_TA/quake3.tlb" + TypeLibraryName="$(IntDir)\quake3.tlb" HeaderFileName=""/> @@ -95,12 +92,12 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Debug/quake3.pch" - AssemblerListingLocation=".\Debug/" - ObjectFile=".\Debug/" - ProgramDataBaseFileName=".\Debug/" + PrecompiledHeaderFile="$(IntDir)\quake3.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" - BrowseInformationFile=".\Debug/" + BrowseInformationFile="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4"/> @@ -109,13 +106,13 @@ @@ -125,7 +122,7 @@ MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" - TypeLibraryName=".\Debug/quake3.tlb" + TypeLibraryName="$(IntDir)\quake3.tlb" HeaderFileName=""/> + ResourceOutputFileName="..\winquake.res"/> @@ -168,10 +165,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\quake3___Win32_Release_TA_DEMO/quake3.pch" - AssemblerListingLocation=".\quake3___Win32_Release_TA_DEMO/" - ObjectFile=".\quake3___Win32_Release_TA_DEMO/" - ProgramDataBaseFileName=".\quake3___Win32_Release_TA_DEMO/" + PrecompiledHeaderFile="$(IntDir)\quake3.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="2"/> @@ -180,13 +177,13 @@ @@ -221,8 +218,8 @@ @@ -236,10 +233,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Release/quake3.pch" - AssemblerListingLocation=".\Release/" - ObjectFile=".\Release/" - ProgramDataBaseFileName=".\Release/" + PrecompiledHeaderFile="$(IntDir)\quake3.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="4" SuppressStartupBanner="TRUE"/> @@ -263,7 +260,7 @@ MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" - TypeLibraryName=".\Release/quake3.tlb" + TypeLibraryName="$(IntDir)\quake3.tlb" HeaderFileName=""/> @@ -288,8 +285,8 @@ @@ -300,12 +297,12 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;PRE_RELEASE_TADEMO;PRE_RELEASE_DEMO" RuntimeLibrary="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\quake3___Win32_Debug_TA_DEMO/quake3.pch" - AssemblerListingLocation=".\quake3___Win32_Debug_TA_DEMO/" - ObjectFile=".\quake3___Win32_Debug_TA_DEMO/" - ProgramDataBaseFileName=".\quake3___Win32_Debug_TA_DEMO/" + PrecompiledHeaderFile="$(IntDir)\quake3.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" - BrowseInformationFile=".\quake3___Win32_Debug_TA_DEMO/" + BrowseInformationFile="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4"/> @@ -314,13 +311,13 @@ @@ -342,7 +339,7 @@ Name="VCResourceCompilerTool" PreprocessorDefinitions="_DEBUG" Culture="1033" - ResourceOutputFileName="win32\winquake.res"/> + ResourceOutputFileName="..\winquake.res"/> @@ -372,10 +369,10 @@ RuntimeLibrary="4" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\quake3___Win32_vector0/quake3.pch" - AssemblerListingLocation=".\quake3___Win32_vector0/" - ObjectFile=".\quake3___Win32_vector0/" - ProgramDataBaseFileName=".\quake3___Win32_vector0/" + PrecompiledHeaderFile="$(IntDir)\quake3.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" WarningLevel="4" SuppressStartupBanner="TRUE" DebugInformationFormat="3"/> @@ -384,13 +381,13 @@ @@ -425,8 +422,8 @@ @@ -437,12 +434,12 @@ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS" RuntimeLibrary="1" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\Debug_TA/quake3.pch" - AssemblerListingLocation=".\Debug_TA/" - ObjectFile=".\Debug_TA/" - ProgramDataBaseFileName=".\Debug_TA/" + PrecompiledHeaderFile="$(IntDir)\quake3.pch" + AssemblerListingLocation="$(IntDir)\" + ObjectFile="$(IntDir)\" + ProgramDataBaseFileName="$(IntDir)\" BrowseInformation="1" - BrowseInformationFile=".\Debug_TA/" + BrowseInformationFile="$(IntDir)\" WarningLevel="3" SuppressStartupBanner="TRUE" DebugInformationFormat="4"/> @@ -451,13 +448,13 @@ @@ -467,7 +464,7 @@ MkTypLibCompatible="TRUE" SuppressStartupBanner="TRUE" TargetEnvironment="1" - TypeLibraryName=".\Debug_TA/quake3.tlb" + TypeLibraryName="$(IntDir)\quake3.tlb" HeaderFileName=""/> + ResourceOutputFileName="..\winquake.res"/> + RelativePath="..\..\client\cl_cgame.c"> + RelativePath="..\..\client\cl_cin.c"> + RelativePath="..\..\client\cl_console.c"> + RelativePath="..\..\client\cl_input.c"> + RelativePath="..\..\client\cl_keys.c"> + RelativePath="..\..\client\cl_main.c"> + RelativePath="..\..\client\cl_net_chan.c"> + RelativePath="..\..\client\cl_parse.c"> + RelativePath="..\..\client\cl_scrn.c"> + RelativePath="..\..\client\cl_ui.c"> + RelativePath="..\..\qcommon\cm_load.c"> + RelativePath="..\..\qcommon\cm_patch.c"> + RelativePath="..\..\qcommon\cm_polylib.c"> + RelativePath="..\..\qcommon\cm_test.c"> + RelativePath="..\..\qcommon\cm_trace.c"> + RelativePath="..\..\qcommon\cmd.c"> + RelativePath="..\..\qcommon\common.c"> + RelativePath="..\..\qcommon\cvar.c"> + RelativePath="..\..\qcommon\files.c"> + RelativePath="..\..\qcommon\huffman.c"> + RelativePath="..\..\qcommon\md4.c"> + RelativePath="..\..\qcommon\msg.c"> + RelativePath="..\..\qcommon\net_chan.c"> + RelativePath="..\..\.\qcommon\q_math.c"> + RelativePath="..\..\.\qcommon\q_shared.c"> + RelativePath="..\..\client\snd_adpcm.c"> + RelativePath="..\..\client\snd_codec.c"> + + + + + RelativePath="..\..\client\snd_main.c"> + + + RelativePath="..\..\client\snd_mix.c"> + RelativePath="..\..\client\snd_openal.c"> + + + RelativePath="..\..\server\sv_bot.c"> + RelativePath="..\..\server\sv_ccmds.c"> + RelativePath="..\..\server\sv_client.c"> + RelativePath="..\..\server\sv_game.c"> + RelativePath="..\..\server\sv_init.c"> + RelativePath="..\..\server\sv_main.c"> + RelativePath="..\..\server\sv_net_chan.c"> + RelativePath="..\..\server\sv_snapshot.c"> + RelativePath="..\..\server\sv_world.c"> + RelativePath="..\..\qcommon\unzip.c"> + RelativePath="..\..\qcommon\vm.c"> + RelativePath="..\..\qcommon\vm_interpreted.c"> + RelativePath="..\..\qcommon\vm_x86.c"> + RelativePath="..\..\win32\win_input.c"> + RelativePath="..\..\win32\win_main.c"> + RelativePath="..\..\win32\win_net.c"> + RelativePath="..\..\win32\win_shared.c"> + RelativePath="..\..\win32\win_snd.c"> + RelativePath="..\..\win32\win_syscon.c"> + RelativePath="..\..\win32\win_wndproc.c"> + RelativePath="..\..\game\bg_public.h"> + RelativePath="..\..\cgame\cg_public.h"> + RelativePath="..\..\client\client.h"> + RelativePath="..\..\qcommon\cm_local.h"> + RelativePath="..\..\qcommon\cm_patch.h"> + RelativePath="..\..\qcommon\cm_polylib.h"> + RelativePath="..\..\qcommon\cm_public.h"> + RelativePath="..\..\game\g_public.h"> + RelativePath="..\..\ui\keycodes.h"> + RelativePath="..\..\client\keys.h"> + RelativePath="..\..\.\qcommon\q_shared.h"> + RelativePath="..\..\qcommon\qcommon.h"> + RelativePath="..\..\qcommon\qfiles.h"> + RelativePath="..\..\renderer\qgl.h"> + RelativePath="..\..\win32\resource.h"> + RelativePath="..\..\server\server.h"> + RelativePath="..\..\client\snd_local.h"> + RelativePath="..\..\client\snd_public.h"> + RelativePath="..\..\.\qcommon\surfaceflags.h"> + RelativePath="..\..\renderer\tr_local.h"> + RelativePath="..\..\renderer\tr_public.h"> + RelativePath="..\..\cgame\tr_types.h"> + RelativePath="..\..\ui\ui_public.h"> + RelativePath="..\..\qcommon\unzip.h"> + RelativePath="..\..\qcommon\vm_local.h"> + RelativePath="..\..\win32\win_local.h"> + RelativePath="..\..\win32\qe3.ico"> - - - - + RelativePath="..\..\win32\winquake.rc"> - - - - - - diff --git a/code/renderer/ref_trin.def b/code/win32/msvc/ref_trin.def similarity index 100% rename from code/renderer/ref_trin.def rename to code/win32/msvc/ref_trin.def diff --git a/code/renderer/renderer.vcproj b/code/win32/msvc/renderer.vcproj similarity index 90% rename from code/renderer/renderer.vcproj rename to code/win32/msvc/renderer.vcproj index 66339b9c..638a1cf0 100644 --- a/code/renderer/renderer.vcproj +++ b/code/win32/msvc/renderer.vcproj @@ -3,8 +3,7 @@ ProjectType="Visual C++" Version="7.10" Name="renderer" - SccProjectName=""$/MissionPack/code/renderer", EJBAAAAA" - SccLocalPath="."> + ProjectGUID="{AB424155-FBED-4D8D-B007-5B6CF93EA395}"> @@ -12,8 +11,8 @@ @@ -63,8 +62,8 @@ @@ -114,8 +113,8 @@ @@ -165,8 +164,8 @@ @@ -216,8 +215,8 @@ @@ -274,10 +273,10 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + RelativePath="..\..\renderer\ref_trin.def"> + RelativePath="..\..\renderer\tr_animation.c"> + RelativePath="..\..\renderer\tr_backend.c"> + RelativePath="..\..\renderer\tr_bsp.c"> + RelativePath="..\..\renderer\tr_cmds.c"> + RelativePath="..\..\renderer\tr_curve.c"> + RelativePath="..\..\renderer\tr_flares.c"> + RelativePath="..\..\renderer\tr_font.c"> + RelativePath="..\..\renderer\tr_image.c"> + RelativePath="..\..\renderer\tr_init.c"> + RelativePath="..\..\renderer\tr_light.c"> + RelativePath="..\..\renderer\tr_main.c"> + RelativePath="..\..\renderer\tr_marks.c"> + RelativePath="..\..\renderer\tr_mesh.c"> + RelativePath="..\..\renderer\tr_model.c"> + RelativePath="..\..\renderer\tr_noise.c"> + RelativePath="..\..\renderer\tr_scene.c"> + RelativePath="..\..\renderer\tr_shade.c"> + RelativePath="..\..\renderer\tr_shade_calc.c"> + RelativePath="..\..\renderer\tr_shader.c"> + RelativePath="..\..\renderer\tr_shadows.c"> + RelativePath="..\..\renderer\tr_sky.c"> + RelativePath="..\..\renderer\tr_surface.c"> + RelativePath="..\..\renderer\tr_world.c"> + RelativePath="..\..\win32\win_gamma.c"> + RelativePath="..\..\win32\win_glimp.c"> + RelativePath="..\..\win32\win_qgl.c"> + RelativePath="..\..\qcommon\cm_public.h"> + RelativePath="..\..\win32\glw_win.h"> + RelativePath="..\..\qcommon\q_shared.h"> + RelativePath="..\..\qcommon\qcommon.h"> + RelativePath="..\..\qcommon\qfiles.h"> + RelativePath="..\..\renderer\qgl.h"> + RelativePath="..\..\qcommon\surfaceflags.h"> + RelativePath="..\..\renderer\tr_local.h"> + RelativePath="..\..\renderer\tr_public.h"> + RelativePath="..\..\cgame\tr_types.h"> + RelativePath="..\..\win32\win_local.h"> + RelativePath="..\..\jpeg-6\jcapimin.c"> + RelativePath="..\..\jpeg-6\jccoefct.c"> + RelativePath="..\..\jpeg-6\jccolor.c"> + RelativePath="..\..\jpeg-6\jcdctmgr.c"> + RelativePath="..\..\jpeg-6\jchuff.c"> + RelativePath="..\..\jpeg-6\jcinit.c"> + RelativePath="..\..\jpeg-6\jcmainct.c"> + RelativePath="..\..\jpeg-6\jcmarker.c"> + RelativePath="..\..\jpeg-6\jcmaster.c"> + RelativePath="..\..\jpeg-6\jcomapi.c"> + RelativePath="..\..\jpeg-6\jcparam.c"> + RelativePath="..\..\jpeg-6\jcphuff.c"> + RelativePath="..\..\jpeg-6\jcprepct.c"> + RelativePath="..\..\jpeg-6\jcsample.c"> + RelativePath="..\..\jpeg-6\jctrans.c"> + RelativePath="..\..\jpeg-6\jdapimin.c"> + RelativePath="..\..\jpeg-6\jdapistd.c"> + RelativePath="..\..\jpeg-6\jdatadst.c"> + RelativePath="..\..\jpeg-6\jdatasrc.c"> + RelativePath="..\..\jpeg-6\jdcoefct.c"> + RelativePath="..\..\jpeg-6\jdcolor.c"> + RelativePath="..\..\jpeg-6\jddctmgr.c"> + RelativePath="..\..\jpeg-6\jdhuff.c"> + RelativePath="..\..\jpeg-6\jdinput.c"> + RelativePath="..\..\jpeg-6\jdmainct.c"> + RelativePath="..\..\jpeg-6\jdmarker.c"> + RelativePath="..\..\jpeg-6\jdmaster.c"> + RelativePath="..\..\jpeg-6\jdpostct.c"> + RelativePath="..\..\jpeg-6\jdsample.c"> + RelativePath="..\..\jpeg-6\jdtrans.c"> + RelativePath="..\..\jpeg-6\jerror.c"> + RelativePath="..\..\jpeg-6\jfdctflt.c"> + RelativePath="..\..\jpeg-6\jidctflt.c"> + RelativePath="..\..\jpeg-6\jmemmgr.c"> + RelativePath="..\..\jpeg-6\jmemnobs.c"> + RelativePath="..\..\jpeg-6\jutils.c"> + RelativePath="..\..\jpeg-6\jchuff.h"> + RelativePath="..\..\jpeg-6\jconfig.h"> + RelativePath="..\..\jpeg-6\jdct.h"> + RelativePath="..\..\jpeg-6\jdhuff.h"> + RelativePath="..\..\jpeg-6\jerror.h"> + RelativePath="..\..\jpeg-6\jinclude.h"> + RelativePath="..\..\jpeg-6\jmemsys.h"> + RelativePath="..\..\jpeg-6\jmorecfg.h"> + RelativePath="..\..\jpeg-6\jpegint.h"> + RelativePath="..\..\jpeg-6\jpeglib.h"> + RelativePath="..\..\jpeg-6\jversion.h"> @@ -2967,7 +2966,7 @@ Name="FreeType2" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + RelativePath="..\..\ft2\ahangles.c"> @@ -3014,7 +3013,7 @@ + RelativePath="..\..\ft2\ahglobal.c"> @@ -3061,7 +3060,7 @@ + RelativePath="..\..\ft2\ahglyph.c"> @@ -3108,7 +3107,7 @@ + RelativePath="..\..\ft2\ahhint.c"> @@ -3155,7 +3154,7 @@ + RelativePath="..\..\ft2\ahmodule.c"> @@ -3202,7 +3201,7 @@ + RelativePath="..\..\ft2\ahoptim.c"> @@ -3249,7 +3248,7 @@ + RelativePath="..\..\ft2\ftcalc.c"> @@ -3296,7 +3295,7 @@ + RelativePath="..\..\ft2\ftdebug.c"> @@ -3343,7 +3342,7 @@ + RelativePath="..\..\ft2\ftextend.c"> @@ -3390,7 +3389,7 @@ + RelativePath="..\..\ft2\ftglyph.c"> @@ -3437,7 +3436,7 @@ + RelativePath="..\..\ft2\ftgrays.c"> @@ -3484,7 +3483,7 @@ + RelativePath="..\..\ft2\ftinit.c"> @@ -3531,7 +3530,7 @@ + RelativePath="..\..\ft2\ftlist.c"> @@ -3578,7 +3577,7 @@ + RelativePath="..\..\ft2\ftmm.c"> @@ -3625,7 +3624,7 @@ + RelativePath="..\..\ft2\ftnames.c"> @@ -3672,7 +3671,7 @@ + RelativePath="..\..\ft2\ftobjs.c"> @@ -3719,7 +3718,7 @@ + RelativePath="..\..\ft2\ftoutln.c"> @@ -3766,7 +3765,7 @@ + RelativePath="..\..\ft2\ftraster.c"> @@ -3813,7 +3812,7 @@ + RelativePath="..\..\ft2\ftrend1.c"> @@ -3860,7 +3859,7 @@ + RelativePath="..\..\ft2\ftsmooth.c"> @@ -3907,7 +3906,7 @@ + RelativePath="..\..\ft2\ftstream.c"> @@ -3954,7 +3953,7 @@ + RelativePath="..\..\ft2\ftsystem.c"> @@ -4001,7 +4000,7 @@ + RelativePath="..\..\ft2\sfdriver.c"> @@ -4048,7 +4047,7 @@ + RelativePath="..\..\ft2\sfobjs.c"> @@ -4095,7 +4094,7 @@ + RelativePath="..\..\ft2\ttcmap.c"> @@ -4142,7 +4141,7 @@ + RelativePath="..\..\ft2\ttdriver.c"> @@ -4189,7 +4188,7 @@ + RelativePath="..\..\ft2\ttgload.c"> @@ -4236,7 +4235,7 @@ + RelativePath="..\..\ft2\ttinterp.c"> @@ -4283,7 +4282,7 @@ + RelativePath="..\..\ft2\ttload.c"> @@ -4330,7 +4329,7 @@ + RelativePath="..\..\ft2\ttobjs.c"> @@ -4377,7 +4376,7 @@ + RelativePath="..\..\ft2\ttpload.c"> @@ -4424,7 +4423,7 @@ + RelativePath="..\..\ft2\ttpost.c"> @@ -4471,7 +4470,7 @@ + RelativePath="..\..\ft2\ttsbit.c"> @@ -4521,7 +4520,7 @@ Name="Include files" Filter="*.h"> + RelativePath="..\..\ft2\ahangles.h"> @@ -4554,7 +4553,7 @@ + RelativePath="..\..\ft2\ahglobal.h"> @@ -4587,7 +4586,7 @@ + RelativePath="..\..\ft2\ahglyph.h"> @@ -4620,7 +4619,7 @@ + RelativePath="..\..\ft2\ahhint.h"> @@ -4653,7 +4652,7 @@ + RelativePath="..\..\ft2\ahloader.h"> @@ -4686,7 +4685,7 @@ + RelativePath="..\..\ft2\ahmodule.h"> @@ -4719,7 +4718,7 @@ + RelativePath="..\..\ft2\ahoptim.h"> @@ -4752,7 +4751,7 @@ + RelativePath="..\..\ft2\ahtypes.h"> @@ -4785,7 +4784,7 @@ + RelativePath="..\..\ft2\autohint.h"> @@ -4818,7 +4817,7 @@ + RelativePath="..\..\ft2\freetype.h"> @@ -4851,7 +4850,7 @@ + RelativePath="..\..\ft2\ftbbox.h"> @@ -4884,7 +4883,7 @@ + RelativePath="..\..\ft2\ftcalc.h"> @@ -4917,7 +4916,7 @@ + RelativePath="..\..\ft2\ftconfig.h"> @@ -4950,7 +4949,7 @@ + RelativePath="..\..\ft2\ftdebug.h"> @@ -4983,7 +4982,7 @@ + RelativePath="..\..\ft2\ftdriver.h"> @@ -5016,7 +5015,7 @@ + RelativePath="..\..\ft2\fterrors.h"> @@ -5049,7 +5048,7 @@ + RelativePath="..\..\ft2\ftextend.h"> @@ -5082,7 +5081,7 @@ + RelativePath="..\..\ft2\ftglyph.h"> @@ -5115,7 +5114,7 @@ + RelativePath="..\..\ft2\ftimage.h"> @@ -5148,7 +5147,7 @@ + RelativePath="..\..\ft2\ftlist.h"> @@ -5181,7 +5180,7 @@ + RelativePath="..\..\ft2\ftmemory.h"> @@ -5214,7 +5213,7 @@ + RelativePath="..\..\ft2\ftmm.h"> @@ -5247,7 +5246,7 @@ + RelativePath="..\..\ft2\ftmodule.h"> @@ -5280,7 +5279,7 @@ + RelativePath="..\..\ft2\ftnames.h"> @@ -5313,7 +5312,7 @@ + RelativePath="..\..\ft2\ftobjs.h"> @@ -5346,7 +5345,7 @@ + RelativePath="..\..\ft2\ftoption.h"> @@ -5379,7 +5378,7 @@ + RelativePath="..\..\ft2\ftoutln.h"> @@ -5412,7 +5411,7 @@ + RelativePath="..\..\ft2\ftrender.h"> @@ -5445,7 +5444,7 @@ + RelativePath="..\..\ft2\ftstream.h"> @@ -5478,7 +5477,7 @@ + RelativePath="..\..\ft2\ftsystem.h"> @@ -5511,7 +5510,7 @@ + RelativePath="..\..\ft2\fttypes.h"> @@ -5544,7 +5543,7 @@ + RelativePath="..\..\ft2\psnames.h"> @@ -5577,7 +5576,7 @@ + RelativePath="..\..\ft2\sfnt.h"> @@ -5610,7 +5609,7 @@ + RelativePath="..\..\ft2\t1errors.h"> @@ -5643,7 +5642,7 @@ + RelativePath="..\..\ft2\t1tables.h"> @@ -5676,7 +5675,7 @@ + RelativePath="..\..\ft2\t1types.h"> @@ -5709,7 +5708,7 @@ + RelativePath="..\..\ft2\t2errors.h"> @@ -5742,7 +5741,7 @@ + RelativePath="..\..\ft2\t2types.h"> @@ -5775,7 +5774,7 @@ + RelativePath="..\..\ft2\ttdriver.h"> @@ -5808,7 +5807,7 @@ + RelativePath="..\..\ft2\tterrors.h"> @@ -5841,7 +5840,7 @@ + RelativePath="..\..\ft2\ttgload.h"> @@ -5874,7 +5873,7 @@ + RelativePath="..\..\ft2\ttinterp.h"> @@ -5907,7 +5906,7 @@ + RelativePath="..\..\ft2\ttnameid.h"> @@ -5940,7 +5939,7 @@ + RelativePath="..\..\ft2\ttobjs.h"> @@ -5973,7 +5972,7 @@ + RelativePath="..\..\ft2\ttpload.h"> @@ -6006,7 +6005,7 @@ + RelativePath="..\..\ft2\tttables.h"> @@ -6039,7 +6038,7 @@ + RelativePath="..\..\ft2\tttags.h"> @@ -6072,7 +6071,7 @@ + RelativePath="..\..\ft2\tttypes.h"> diff --git a/code/ui/ui.def b/code/win32/msvc/ui.def similarity index 100% rename from code/ui/ui.def rename to code/win32/msvc/ui.def diff --git a/code/ui/ui.vcproj b/code/win32/msvc/ui.vcproj similarity index 76% rename from code/ui/ui.vcproj rename to code/win32/msvc/ui.vcproj index 1bd745fb..33a2ff59 100644 --- a/code/ui/ui.vcproj +++ b/code/win32/msvc/ui.vcproj @@ -1,1008 +1,879 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +