From 7c1f101a2969b40d509158db2693b4afdc3794b3 Mon Sep 17 00:00:00 2001 From: Timothee Besset Date: Sun, 2 Jun 2013 00:56:33 +0100 Subject: [PATCH] spitting x64 q3map2 now --- libs/ddslib/ddslib.vcxproj | 8 ++++-- libs/l_net/l_net.vcxproj | 8 ++++-- libs/mathlib/mathlib.vcxproj | 8 ++++-- libs/md5lib/md5lib.vcxproj | 8 ++++-- libs/picomodel/picomodel.vcxproj | 8 ++++-- radiant.sln | 34 ----------------------- tools/quake3/common/quake3-common.vcxproj | 8 ++++-- tools/quake3/q3map2/q3map2.vcxproj | 4 +-- 8 files changed, 38 insertions(+), 48 deletions(-) diff --git a/libs/ddslib/ddslib.vcxproj b/libs/ddslib/ddslib.vcxproj index 37e77d6..d40be6f 100644 --- a/libs/ddslib/ddslib.vcxproj +++ b/libs/ddslib/ddslib.vcxproj @@ -62,12 +62,16 @@ $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + Disabled diff --git a/libs/l_net/l_net.vcxproj b/libs/l_net/l_net.vcxproj index fa0911d..ac3f61f 100644 --- a/libs/l_net/l_net.vcxproj +++ b/libs/l_net/l_net.vcxproj @@ -62,12 +62,16 @@ $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + Disabled diff --git a/libs/mathlib/mathlib.vcxproj b/libs/mathlib/mathlib.vcxproj index aebedae..792b1dc 100644 --- a/libs/mathlib/mathlib.vcxproj +++ b/libs/mathlib/mathlib.vcxproj @@ -62,12 +62,16 @@ $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + Disabled diff --git a/libs/md5lib/md5lib.vcxproj b/libs/md5lib/md5lib.vcxproj index 5416914..8a8785d 100644 --- a/libs/md5lib/md5lib.vcxproj +++ b/libs/md5lib/md5lib.vcxproj @@ -62,12 +62,16 @@ $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + Disabled diff --git a/libs/picomodel/picomodel.vcxproj b/libs/picomodel/picomodel.vcxproj index 988952d..f1d11d1 100644 --- a/libs/picomodel/picomodel.vcxproj +++ b/libs/picomodel/picomodel.vcxproj @@ -62,12 +62,16 @@ $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + Disabled diff --git a/radiant.sln b/radiant.sln index 678cd70..e26621d 100644 --- a/radiant.sln +++ b/radiant.sln @@ -94,7 +94,6 @@ Global {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Debug|Win32.ActiveCfg = Debug|Win32 {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Debug|Win32.Build.0 = Debug|Win32 {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Debug|x64.ActiveCfg = Debug|x64 - {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Debug|x64.Build.0 = Debug|x64 {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Release|Win32.ActiveCfg = Release|Win32 {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Release|Win32.Build.0 = Release|Win32 {65D02375-63EE-4A8A-9F8E-504B1D5A1D02}.Release|x64.ActiveCfg = Release|x64 @@ -118,7 +117,6 @@ Global {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|Win32.ActiveCfg = Debug|Win32 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|Win32.Build.0 = Debug|Win32 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|x64.ActiveCfg = Debug|x64 - {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Debug|x64.Build.0 = Debug|x64 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Release|Win32.ActiveCfg = Release|Win32 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Release|Win32.Build.0 = Release|Win32 {E13CCFB0-A366-4EF3-A66F-C374B563E4DF}.Release|x64.ActiveCfg = Release|x64 @@ -126,7 +124,6 @@ Global {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Debug|Win32.ActiveCfg = Debug|Win32 {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Debug|Win32.Build.0 = Debug|Win32 {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Debug|x64.ActiveCfg = Debug|x64 - {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Debug|x64.Build.0 = Debug|x64 {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Release|Win32.ActiveCfg = Release|Win32 {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Release|Win32.Build.0 = Release|Win32 {0B522841-BDCC-493A-BA5C-604AE2CD5756}.Release|x64.ActiveCfg = Release|x64 @@ -174,7 +171,6 @@ Global {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.ActiveCfg = Debug|Win32 {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|Win32.Build.0 = Debug|Win32 {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|x64.ActiveCfg = Debug|x64 - {6C1116CE-D99E-4629-9E69-A9329335D706}.Debug|x64.Build.0 = Debug|x64 {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.ActiveCfg = Release|Win32 {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|Win32.Build.0 = Release|Win32 {6C1116CE-D99E-4629-9E69-A9329335D706}.Release|x64.ActiveCfg = Release|x64 @@ -182,7 +178,6 @@ Global {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|Win32.ActiveCfg = Debug|Win32 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|Win32.Build.0 = Debug|Win32 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|x64.ActiveCfg = Debug|x64 - {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Debug|x64.Build.0 = Debug|x64 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Release|Win32.ActiveCfg = Release|Win32 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Release|Win32.Build.0 = Release|Win32 {A43B5811-4BCC-483A-BDAC-F5721DCF9B4A}.Release|x64.ActiveCfg = Release|x64 @@ -190,7 +185,6 @@ Global {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Debug|Win32.ActiveCfg = Debug|Win32 {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Debug|Win32.Build.0 = Debug|Win32 {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Debug|x64.ActiveCfg = Debug|x64 - {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Debug|x64.Build.0 = Debug|x64 {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Release|Win32.ActiveCfg = Release|Win32 {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Release|Win32.Build.0 = Release|Win32 {17DD38AA-4842-45BC-9304-2ADC1A12B4F4}.Release|x64.ActiveCfg = Release|x64 @@ -198,7 +192,6 @@ Global {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Debug|Win32.ActiveCfg = Debug|Win32 {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Debug|Win32.Build.0 = Debug|Win32 {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Debug|x64.ActiveCfg = Debug|x64 - {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Debug|x64.Build.0 = Debug|x64 {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Release|Win32.ActiveCfg = Release|Win32 {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Release|Win32.Build.0 = Release|Win32 {1F9977F6-216F-4AE1-9928-59B72CF31C46}.Release|x64.ActiveCfg = Release|x64 @@ -206,7 +199,6 @@ Global {43C01E60-21CC-49F5-8A11-F460BC866A31}.Debug|Win32.ActiveCfg = Debug|Win32 {43C01E60-21CC-49F5-8A11-F460BC866A31}.Debug|Win32.Build.0 = Debug|Win32 {43C01E60-21CC-49F5-8A11-F460BC866A31}.Debug|x64.ActiveCfg = Debug|x64 - {43C01E60-21CC-49F5-8A11-F460BC866A31}.Debug|x64.Build.0 = Debug|x64 {43C01E60-21CC-49F5-8A11-F460BC866A31}.Release|Win32.ActiveCfg = Release|Win32 {43C01E60-21CC-49F5-8A11-F460BC866A31}.Release|Win32.Build.0 = Release|Win32 {43C01E60-21CC-49F5-8A11-F460BC866A31}.Release|x64.ActiveCfg = Release|x64 @@ -214,7 +206,6 @@ Global {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Debug|Win32.ActiveCfg = Debug|Win32 {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Debug|Win32.Build.0 = Debug|Win32 {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Debug|x64.ActiveCfg = Debug|x64 - {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Debug|x64.Build.0 = Debug|x64 {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Release|Win32.ActiveCfg = Release|Win32 {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Release|Win32.Build.0 = Release|Win32 {1B0E70B0-ED20-4021-9BBE-5168CB8DAE90}.Release|x64.ActiveCfg = Release|x64 @@ -222,7 +213,6 @@ Global {DDBF170A-42DF-4836-9006-816422E08493}.Debug|Win32.ActiveCfg = Debug|Win32 {DDBF170A-42DF-4836-9006-816422E08493}.Debug|Win32.Build.0 = Debug|Win32 {DDBF170A-42DF-4836-9006-816422E08493}.Debug|x64.ActiveCfg = Debug|x64 - {DDBF170A-42DF-4836-9006-816422E08493}.Debug|x64.Build.0 = Debug|x64 {DDBF170A-42DF-4836-9006-816422E08493}.Release|Win32.ActiveCfg = Release|Win32 {DDBF170A-42DF-4836-9006-816422E08493}.Release|Win32.Build.0 = Release|Win32 {DDBF170A-42DF-4836-9006-816422E08493}.Release|x64.ActiveCfg = Release|x64 @@ -230,7 +220,6 @@ Global {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Debug|Win32.ActiveCfg = Debug|Win32 {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Debug|Win32.Build.0 = Debug|Win32 {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Debug|x64.ActiveCfg = Debug|x64 - {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Debug|x64.Build.0 = Debug|x64 {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Release|Win32.ActiveCfg = Release|Win32 {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Release|Win32.Build.0 = Release|Win32 {83C877DA-17B2-4863-B085-06AE9A8D68F3}.Release|x64.ActiveCfg = Release|x64 @@ -238,7 +227,6 @@ Global {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Debug|Win32.ActiveCfg = Debug|Win32 {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Debug|Win32.Build.0 = Debug|Win32 {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Debug|x64.ActiveCfg = Debug|x64 - {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Debug|x64.Build.0 = Debug|x64 {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Release|Win32.ActiveCfg = Release|Win32 {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Release|Win32.Build.0 = Release|Win32 {AEBCB950-AB67-48BB-9AF5-FCFB042824E8}.Release|x64.ActiveCfg = Release|x64 @@ -246,7 +234,6 @@ Global {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Debug|Win32.ActiveCfg = Debug|Win32 {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Debug|Win32.Build.0 = Debug|Win32 {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Debug|x64.ActiveCfg = Debug|x64 - {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Debug|x64.Build.0 = Debug|x64 {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Release|Win32.ActiveCfg = Release|Win32 {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Release|Win32.Build.0 = Release|Win32 {6FDF6CFE-52FF-4E8C-A6F6-C0392DAE4DB7}.Release|x64.ActiveCfg = Release|x64 @@ -254,7 +241,6 @@ Global {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|Win32.ActiveCfg = Debug|Win32 {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|Win32.Build.0 = Debug|Win32 {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|x64.ActiveCfg = Debug|x64 - {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Debug|x64.Build.0 = Debug|x64 {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.ActiveCfg = Release|Win32 {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|Win32.Build.0 = Release|Win32 {DEFCF433-3A47-40EB-BBF7-861211C3A941}.Release|x64.ActiveCfg = Release|x64 @@ -262,7 +248,6 @@ Global {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|Win32.ActiveCfg = Debug|Win32 {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|Win32.Build.0 = Debug|Win32 {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|x64.ActiveCfg = Debug|x64 - {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Debug|x64.Build.0 = Debug|x64 {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Release|Win32.ActiveCfg = Release|Win32 {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Release|Win32.Build.0 = Release|Win32 {8BE599BF-6318-4B0C-AC3E-DE811676C63B}.Release|x64.ActiveCfg = Release|x64 @@ -270,7 +255,6 @@ Global {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|Win32.ActiveCfg = Debug|Win32 {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|Win32.Build.0 = Debug|Win32 {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|x64.ActiveCfg = Debug|x64 - {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Debug|x64.Build.0 = Debug|x64 {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Release|Win32.ActiveCfg = Release|Win32 {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Release|Win32.Build.0 = Release|Win32 {18116120-2710-4DD8-B1AC-940D0BDB36EF}.Release|x64.ActiveCfg = Release|x64 @@ -278,7 +262,6 @@ Global {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|Win32.ActiveCfg = Debug|Win32 {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|Win32.Build.0 = Debug|Win32 {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|x64.ActiveCfg = Debug|x64 - {04213509-5ED3-4C74-B8A2-480BE6F48363}.Debug|x64.Build.0 = Debug|x64 {04213509-5ED3-4C74-B8A2-480BE6F48363}.Release|Win32.ActiveCfg = Release|Win32 {04213509-5ED3-4C74-B8A2-480BE6F48363}.Release|Win32.Build.0 = Release|Win32 {04213509-5ED3-4C74-B8A2-480BE6F48363}.Release|x64.ActiveCfg = Release|x64 @@ -286,7 +269,6 @@ Global {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|Win32.ActiveCfg = Debug|Win32 {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|Win32.Build.0 = Debug|Win32 {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|x64.ActiveCfg = Debug|x64 - {8D3160AB-B386-4970-8146-826BC293CCB1}.Debug|x64.Build.0 = Debug|x64 {8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.ActiveCfg = Release|Win32 {8D3160AB-B386-4970-8146-826BC293CCB1}.Release|Win32.Build.0 = Release|Win32 {8D3160AB-B386-4970-8146-826BC293CCB1}.Release|x64.ActiveCfg = Release|x64 @@ -294,7 +276,6 @@ Global {BA1BC409-744B-4270-8E47-BA10872313AD}.Debug|Win32.ActiveCfg = Debug|Win32 {BA1BC409-744B-4270-8E47-BA10872313AD}.Debug|Win32.Build.0 = Debug|Win32 {BA1BC409-744B-4270-8E47-BA10872313AD}.Debug|x64.ActiveCfg = Debug|x64 - {BA1BC409-744B-4270-8E47-BA10872313AD}.Debug|x64.Build.0 = Debug|x64 {BA1BC409-744B-4270-8E47-BA10872313AD}.Release|Win32.ActiveCfg = Release|Win32 {BA1BC409-744B-4270-8E47-BA10872313AD}.Release|Win32.Build.0 = Release|Win32 {BA1BC409-744B-4270-8E47-BA10872313AD}.Release|x64.ActiveCfg = Release|x64 @@ -302,7 +283,6 @@ Global {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.ActiveCfg = Debug|Win32 {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|Win32.Build.0 = Debug|Win32 {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|x64.ActiveCfg = Debug|x64 - {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Debug|x64.Build.0 = Debug|x64 {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|Win32.ActiveCfg = Release|Win32 {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|Win32.Build.0 = Release|Win32 {C6FA63AA-5F37-4D43-BE6B-09903E70C9E1}.Release|x64.ActiveCfg = Release|x64 @@ -310,7 +290,6 @@ Global {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|Win32.ActiveCfg = Debug|Win32 {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|Win32.Build.0 = Debug|Win32 {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|x64.ActiveCfg = Debug|x64 - {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Debug|x64.Build.0 = Debug|x64 {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Release|Win32.ActiveCfg = Release|Win32 {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Release|Win32.Build.0 = Release|Win32 {F291A09D-73BC-48FF-98EE-D672BBDE5C16}.Release|x64.ActiveCfg = Release|x64 @@ -318,7 +297,6 @@ Global {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|Win32.ActiveCfg = Debug|Win32 {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|Win32.Build.0 = Debug|Win32 {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|x64.ActiveCfg = Debug|x64 - {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Debug|x64.Build.0 = Debug|x64 {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Release|Win32.ActiveCfg = Release|Win32 {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Release|Win32.Build.0 = Release|Win32 {4F52DED4-285A-4E99-9C78-734D59E8ACD6}.Release|x64.ActiveCfg = Release|x64 @@ -326,7 +304,6 @@ Global {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|Win32.ActiveCfg = Debug|Win32 {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|Win32.Build.0 = Debug|Win32 {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|x64.ActiveCfg = Debug|x64 - {F400371F-455F-4B6C-9F13-A2E57110E725}.Debug|x64.Build.0 = Debug|x64 {F400371F-455F-4B6C-9F13-A2E57110E725}.Release|Win32.ActiveCfg = Release|Win32 {F400371F-455F-4B6C-9F13-A2E57110E725}.Release|Win32.Build.0 = Release|Win32 {F400371F-455F-4B6C-9F13-A2E57110E725}.Release|x64.ActiveCfg = Release|x64 @@ -334,7 +311,6 @@ Global {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|Win32.ActiveCfg = Debug|Win32 {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|Win32.Build.0 = Debug|Win32 {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|x64.ActiveCfg = Debug|x64 - {32AB82AA-C781-4E5E-83A0-A164D371306F}.Debug|x64.Build.0 = Debug|x64 {32AB82AA-C781-4E5E-83A0-A164D371306F}.Release|Win32.ActiveCfg = Release|Win32 {32AB82AA-C781-4E5E-83A0-A164D371306F}.Release|Win32.Build.0 = Release|Win32 {32AB82AA-C781-4E5E-83A0-A164D371306F}.Release|x64.ActiveCfg = Release|x64 @@ -342,7 +318,6 @@ Global {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|Win32.ActiveCfg = Debug|Win32 {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|Win32.Build.0 = Debug|Win32 {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|x64.ActiveCfg = Debug|x64 - {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Debug|x64.Build.0 = Debug|x64 {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Release|Win32.ActiveCfg = Release|Win32 {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Release|Win32.Build.0 = Release|Win32 {12932084-E212-45AB-B3BE-A2A5AEEBA581}.Release|x64.ActiveCfg = Release|x64 @@ -350,7 +325,6 @@ Global {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|Win32.ActiveCfg = Debug|Win32 {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|Win32.Build.0 = Debug|Win32 {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|x64.ActiveCfg = Debug|x64 - {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Debug|x64.Build.0 = Debug|x64 {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Release|Win32.ActiveCfg = Release|Win32 {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Release|Win32.Build.0 = Release|Win32 {AB6534A8-ED1B-46DC-84EA-8AA080C12F6A}.Release|x64.ActiveCfg = Release|x64 @@ -358,7 +332,6 @@ Global {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|Win32.ActiveCfg = Debug|Win32 {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|Win32.Build.0 = Debug|Win32 {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|x64.ActiveCfg = Debug|x64 - {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Debug|x64.Build.0 = Debug|x64 {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Release|Win32.ActiveCfg = Release|Win32 {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Release|Win32.Build.0 = Release|Win32 {4E63003A-6B5D-4076-8ADF-D5A94809CE32}.Release|x64.ActiveCfg = Release|x64 @@ -366,7 +339,6 @@ Global {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|Win32.ActiveCfg = Debug|Win32 {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|Win32.Build.0 = Debug|Win32 {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|x64.ActiveCfg = Debug|x64 - {302086A7-5C73-42A4-8591-F5C9336EC911}.Debug|x64.Build.0 = Debug|x64 {302086A7-5C73-42A4-8591-F5C9336EC911}.Release|Win32.ActiveCfg = Release|Win32 {302086A7-5C73-42A4-8591-F5C9336EC911}.Release|Win32.Build.0 = Release|Win32 {302086A7-5C73-42A4-8591-F5C9336EC911}.Release|x64.ActiveCfg = Release|x64 @@ -374,7 +346,6 @@ Global {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|Win32.ActiveCfg = Debug|Win32 {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|Win32.Build.0 = Debug|Win32 {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|x64.ActiveCfg = Debug|x64 - {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Debug|x64.Build.0 = Debug|x64 {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Release|Win32.ActiveCfg = Release|Win32 {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Release|Win32.Build.0 = Release|Win32 {E37A9846-84FC-48F8-9880-954C5D9F8ED0}.Release|x64.ActiveCfg = Release|x64 @@ -382,7 +353,6 @@ Global {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|Win32.ActiveCfg = Debug|Win32 {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|Win32.Build.0 = Debug|Win32 {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|x64.ActiveCfg = Debug|x64 - {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Debug|x64.Build.0 = Debug|x64 {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Release|Win32.ActiveCfg = Release|Win32 {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Release|Win32.Build.0 = Release|Win32 {850DD97C-B457-497D-B5F5-DA1904FAC5F9}.Release|x64.ActiveCfg = Release|x64 @@ -390,7 +360,6 @@ Global {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|Win32.ActiveCfg = Debug|Win32 {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|Win32.Build.0 = Debug|Win32 {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|x64.ActiveCfg = Debug|x64 - {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Debug|x64.Build.0 = Debug|x64 {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Release|Win32.ActiveCfg = Release|Win32 {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Release|Win32.Build.0 = Release|Win32 {D43C13B9-35AC-4EC1-8A90-DF6D7132B9BD}.Release|x64.ActiveCfg = Release|x64 @@ -398,7 +367,6 @@ Global {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Debug|Win32.ActiveCfg = Debug|Win32 {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Debug|Win32.Build.0 = Debug|Win32 {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Debug|x64.ActiveCfg = Debug|x64 - {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Debug|x64.Build.0 = Debug|x64 {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Release|Win32.ActiveCfg = Release|Win32 {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Release|Win32.Build.0 = Release|Win32 {9FD68F2C-B26A-461D-96E0-55AFC48AC9E0}.Release|x64.ActiveCfg = Release|x64 @@ -406,7 +374,6 @@ Global {7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Debug|Win32.ActiveCfg = Debug|Win32 {7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Debug|Win32.Build.0 = Debug|Win32 {7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Debug|x64.ActiveCfg = Debug|x64 - {7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Debug|x64.Build.0 = Debug|x64 {7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Release|Win32.ActiveCfg = Release|Win32 {7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Release|Win32.Build.0 = Release|Win32 {7AF7537E-94C3-4680-8F5E-C1CE30DC2041}.Release|x64.ActiveCfg = Release|x64 @@ -414,7 +381,6 @@ Global {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}.Debug|Win32.ActiveCfg = Debug|Win32 {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}.Debug|Win32.Build.0 = Debug|Win32 {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}.Debug|x64.ActiveCfg = Debug|x64 - {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}.Debug|x64.Build.0 = Debug|x64 {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}.Release|Win32.ActiveCfg = Release|Win32 {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}.Release|Win32.Build.0 = Release|Win32 {8DFCF3C0-5EC6-4E28-9D38-23FBE5F214FB}.Release|x64.ActiveCfg = Release|x64 diff --git a/tools/quake3/common/quake3-common.vcxproj b/tools/quake3/common/quake3-common.vcxproj index ff17fe7..7be06d0 100644 --- a/tools/quake3/common/quake3-common.vcxproj +++ b/tools/quake3/common/quake3-common.vcxproj @@ -62,12 +62,16 @@ $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + $(SolutionDir)\build\$(Configuration)\libs\ $(SolutionDir)\build\intermediate\$(Configuration)\$(ProjectName)\ - + + $(SolutionDir)\build\$(Configuration)\$(Platform)\libs\ + Disabled diff --git a/tools/quake3/q3map2/q3map2.vcxproj b/tools/quake3/q3map2/q3map2.vcxproj index ed869f1..19f77c5 100644 --- a/tools/quake3/q3map2/q3map2.vcxproj +++ b/tools/quake3/q3map2/q3map2.vcxproj @@ -106,7 +106,7 @@ /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)\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(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) true Console @@ -146,7 +146,7 @@ /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)\$(Configuration)\$(Platform);$(SolutionDir)\..\jpeg-9\x64\Release;$(SolutionDir)\build\$(Configuration)\libs;%(AdditionalLibraryDirectories) + $(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) true Console true