From ce8800490053eb2f7976560f015126796aeece47 Mon Sep 17 00:00:00 2001
From: Scott Ehlert <ds@alliedmods.net>
Date: Tue, 13 Mar 2007 21:10:28 +0000
Subject: [PATCH] Tiny bit of reorganizing done to WinCSX

---
 .../csx/WinCSX/{ => msvc7}/WinCSX.vcproj      |  28 ++++++++++--------
 dlls/cstrike/csx/WinCSX/msvc8/WinCSX.vcproj   |  12 ++++----
 .../csx/WinCSX/{ => resources}/Resource.h     |   0
 .../{ => resources}/WinCSX.exe.manifest       |   0
 .../csx/WinCSX/{ => resources}/WinCSX.ico     | Bin
 .../csx/WinCSX/{ => resources}/WinCSX.rc      |   0
 .../csx/WinCSX/{ => resources}/small.ico      | Bin
 dlls/cstrike/csx/msvc7/csx.sln                |   2 +-
 installer/AMXXRelease/AMXXRelease.exe         | Bin 32768 -> 32768 bytes
 installer/AMXXRelease/ModCstrike.cs           |   2 +-
 10 files changed, 24 insertions(+), 20 deletions(-)
 rename dlls/cstrike/csx/WinCSX/{ => msvc7}/WinCSX.vcproj (86%)
 rename dlls/cstrike/csx/WinCSX/{ => resources}/Resource.h (100%)
 rename dlls/cstrike/csx/WinCSX/{ => resources}/WinCSX.exe.manifest (100%)
 rename dlls/cstrike/csx/WinCSX/{ => resources}/WinCSX.ico (100%)
 rename dlls/cstrike/csx/WinCSX/{ => resources}/WinCSX.rc (100%)
 rename dlls/cstrike/csx/WinCSX/{ => resources}/small.ico (100%)

diff --git a/dlls/cstrike/csx/WinCSX/WinCSX.vcproj b/dlls/cstrike/csx/WinCSX/msvc7/WinCSX.vcproj
similarity index 86%
rename from dlls/cstrike/csx/WinCSX/WinCSX.vcproj
rename to dlls/cstrike/csx/WinCSX/msvc7/WinCSX.vcproj
index dd9e9152..094b12be 100755
--- a/dlls/cstrike/csx/WinCSX/WinCSX.vcproj
+++ b/dlls/cstrike/csx/WinCSX/msvc7/WinCSX.vcproj
@@ -20,6 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\resources"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -68,6 +69,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\resources"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="3"
@@ -116,7 +118,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\stdafx.cpp">
+				RelativePath="..\stdafx.cpp">
 				<FileConfiguration
 					Name="Debug|Win32">
 					<Tool
@@ -131,7 +133,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\WinCSX.cpp">
+				RelativePath="..\WinCSX.cpp">
 			</File>
 		</Filter>
 		<Filter
@@ -139,13 +141,13 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
 			<File
-				RelativePath=".\Resource.h">
+				RelativePath="..\resources\Resource.h">
 			</File>
 			<File
-				RelativePath=".\stdafx.h">
+				RelativePath="..\stdafx.h">
 			</File>
 			<File
-				RelativePath=".\WinCSX.h">
+				RelativePath="..\WinCSX.h">
 			</File>
 		</Filter>
 		<Filter
@@ -153,32 +155,32 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath=".\small.ico">
+				RelativePath="..\resources\small.ico">
 			</File>
 			<File
-				RelativePath=".\WinCSX.exe.manifest">
+				RelativePath="..\resources\WinCSX.exe.manifest">
 			</File>
 			<File
-				RelativePath=".\WinCSX.ico">
+				RelativePath="..\resources\WinCSX.ico">
 			</File>
 			<File
-				RelativePath=".\WinCSX.rc">
+				RelativePath="..\resources\WinCSX.rc">
 			</File>
 		</Filter>
 		<Filter
 			Name="Dependencies"
 			Filter="">
 			<File
-				RelativePath=".\amxxmodule.h">
+				RelativePath="..\amxxmodule.h">
 			</File>
 			<File
-				RelativePath=".\CRank.cpp">
+				RelativePath="..\CRank.cpp">
 			</File>
 			<File
-				RelativePath=".\CRank.h">
+				RelativePath="..\CRank.h">
 			</File>
 			<File
-				RelativePath=".\moduleconfig.h">
+				RelativePath="..\moduleconfig.h">
 			</File>
 		</Filter>
 	</Files>
diff --git a/dlls/cstrike/csx/WinCSX/msvc8/WinCSX.vcproj b/dlls/cstrike/csx/WinCSX/msvc8/WinCSX.vcproj
index 0f87a582..9f5a025a 100644
--- a/dlls/cstrike/csx/WinCSX/msvc8/WinCSX.vcproj
+++ b/dlls/cstrike/csx/WinCSX/msvc8/WinCSX.vcproj
@@ -41,6 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\resources"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,6 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\resources"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -211,7 +213,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\Resource.h"
+				RelativePath="..\resources\Resource.h"
 				>
 			</File>
 			<File
@@ -229,19 +231,19 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath="..\small.ico"
+				RelativePath="..\resources\small.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\WinCSX.exe.manifest"
+				RelativePath="..\resources\WinCSX.exe.manifest"
 				>
 			</File>
 			<File
-				RelativePath="..\WinCSX.ico"
+				RelativePath="..\resources\WinCSX.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\WinCSX.rc"
+				RelativePath="..\resources\WinCSX.rc"
 				>
 			</File>
 		</Filter>
diff --git a/dlls/cstrike/csx/WinCSX/Resource.h b/dlls/cstrike/csx/WinCSX/resources/Resource.h
similarity index 100%
rename from dlls/cstrike/csx/WinCSX/Resource.h
rename to dlls/cstrike/csx/WinCSX/resources/Resource.h
diff --git a/dlls/cstrike/csx/WinCSX/WinCSX.exe.manifest b/dlls/cstrike/csx/WinCSX/resources/WinCSX.exe.manifest
similarity index 100%
rename from dlls/cstrike/csx/WinCSX/WinCSX.exe.manifest
rename to dlls/cstrike/csx/WinCSX/resources/WinCSX.exe.manifest
diff --git a/dlls/cstrike/csx/WinCSX/WinCSX.ico b/dlls/cstrike/csx/WinCSX/resources/WinCSX.ico
similarity index 100%
rename from dlls/cstrike/csx/WinCSX/WinCSX.ico
rename to dlls/cstrike/csx/WinCSX/resources/WinCSX.ico
diff --git a/dlls/cstrike/csx/WinCSX/WinCSX.rc b/dlls/cstrike/csx/WinCSX/resources/WinCSX.rc
similarity index 100%
rename from dlls/cstrike/csx/WinCSX/WinCSX.rc
rename to dlls/cstrike/csx/WinCSX/resources/WinCSX.rc
diff --git a/dlls/cstrike/csx/WinCSX/small.ico b/dlls/cstrike/csx/WinCSX/resources/small.ico
similarity index 100%
rename from dlls/cstrike/csx/WinCSX/small.ico
rename to dlls/cstrike/csx/WinCSX/resources/small.ico
diff --git a/dlls/cstrike/csx/msvc7/csx.sln b/dlls/cstrike/csx/msvc7/csx.sln
index 9b3355fc..14dbaa34 100755
--- a/dlls/cstrike/csx/msvc7/csx.sln
+++ b/dlls/cstrike/csx/msvc7/csx.sln
@@ -3,7 +3,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "csx.vcproj", "{1DC4A
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\WinCSX\WinCSX.vcproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\WinCSX\msvc7\WinCSX.vcproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe
index 4514314e5b70e22013e89b13cb76583915d80654..aa830880c13241092819e867b7adae9f817d0615 100755
GIT binary patch
delta 683
zcmYjP&ubG=5T5s{37c%To5mzYF*c^zZhnZ1Eu<-8tQKQim8!&C1lP2PMQp<sJZLp5
z3K8*;Wzdr#2p*&Xi4PBoz2xFW(Tish{{St52SIeAO`5sP_vXhp-we;Txoz|MT@HTd
zUX<N*o|Tj#6QBfSHh>{Hu>i){d3HzKVpWBi$kc#576)KdkppnyIy1zqIv(PZjQ6!&
z@w5z;<p5<oE^CDF4Hv)`EA8EgdfiqL-)X19Rm!CR0tSa;#3cdvxmA;~84ckMO;(Wd
zOS_3j<JPK-hmzZIWmt-@_0YfV(tqtliGH2vb^JJ-2>E^85k4BxHf}}GtB<oB9@WQ2
z^Hk88QS8B&yO<RIlNcc%B#BlIU+4vP9e?SWNUy|NkKEgsPwrt4u$(M}A8%?nKpfpQ
zRW0P}?SD!=k@ki|FR7z*z%|1E5BRAQr47IM@V%D6lc_NKjTcjg-3bLMebzqlJoSOG
zBUsHOq!NXm_+7e+`E(FlnZ?K@1t4BL1C2odm88TA#i>d1Z^YEzB@eGJh}YSjfxfwO
zfY)ZC_;Y$dx&q5^73Lr-w$9YJsy5lHkydNE@jX@koc%K)9-Ua>1IJAw*|0^Ez@QTg
zanp2S+r;VFM!!(ZgUnN3nDn%N4UIW_;URNp!GQfRDt?rk-3PADPi!XUgI;bM!e9B;
H?-=gCetVk2

delta 664
zcmYjP&ubG=5T5tc4axrKhM1&lv9)fq*`x`qR;*TOqZHFvEL%(MMQkjs$0lqAg;u(P
zpcVzgpx{aIWD(T(ZtBTHK~U;N{R=#b6cIrYoM^Mnyu<t6{P^aZ;rTxIeSYT#m%_D`
zPBvd#ozmLN024sw132MYcMQAPG`lFSvSp3A$n=<!GXWT790rhZgE_+02NL{`jJK@a
zW|sohg&0L5l9wiYMFQCF^~#%GIpme_oi(0ZpjZ|l=5QDxt}sB9dy5LzI}^CeQnc$7
zuXGWQ#k~g#7BcO)ln$Hq7W!8K{pY5a=)VxXjUUpf#11uRp;C*6aZg3r9$<MqVIMls
zM+wayr4~FLU{d%`qCt0@Bzk##VHa5if7v;sRpMfc+)Fr=*~@O?Os1H`Ee%JBBN$V+
z5^8JxeX21U6ZWi9MRS35!v7cew&|q_KdSiNO5s>G$u{sp_ISw9pt{X7#k1@>WBs_C
zONB?t^(ZRYIu7;5@l9^tII97elN0c84}eZm%;IEenC|DIl&?fM&WV@(9WgeApHA)<
zJ4df^{fN8%_36spk=tuOfBYUFyeuA{TH<P<Ohub^4)?ho+%1dK?&~%zFkNWnK^DQe
q;Yj0)5a*fm_gLs4ICT2N_nCU|z$dfEwgR(pnO7YVt$u5(IibI51eZDh

diff --git a/installer/AMXXRelease/ModCstrike.cs b/installer/AMXXRelease/ModCstrike.cs
index 052fdca1..5560e87e 100755
--- a/installer/AMXXRelease/ModCstrike.cs
+++ b/installer/AMXXRelease/ModCstrike.cs
@@ -37,7 +37,7 @@ public override sealed bool CopyExtraFiles(ABuilder ab, string basedir, string s
 			if ((int)System.Environment.OSVersion.Platform == 128)
 			{
 			} else {
-				File.Copy(source + "\\dlls\\cstrike\\csx\\WinCSX\\Release\\WinCSX.exe",
+				File.Copy(source + "\\dlls\\cstrike\\csx\\WinCSX\\msvc7\\Release\\WinCSX.exe",
 					  basedir + "\\data\\WinCSX.exe",
 					  true);
 			}