From af96229d5da590704254c94910d6be4e66e3d9ca Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Tue, 13 Mar 2007 18:44:23 +0000 Subject: [PATCH] Massive reorganization attempt - part 1.75 --- dlls/cstrike/{ => cstrike}/CstrikePlayer.cpp | 0 dlls/cstrike/{ => cstrike}/CstrikePlayer.h | 0 dlls/cstrike/{ => cstrike}/Makefile | 4 +- dlls/cstrike/{ => cstrike}/cstrike.cpp | 0 dlls/cstrike/{ => cstrike}/cstrike.h | 0 dlls/cstrike/{ => cstrike}/msvc7/cstrike.sln | 0 .../{ => cstrike}/msvc7/cstrike.vcproj | 0 dlls/cstrike/{ => cstrike}/msvc8/cstrike.sln | 0 .../{ => cstrike}/msvc8/cstrike.vcproj | 0 dlls/cstrike/{ => cstrike}/sdk/amxxmodule.cpp | 0 dlls/cstrike/{ => cstrike}/sdk/amxxmodule.h | 0 dlls/cstrike/{ => cstrike}/sdk/moduleconfig.h | 0 dlls/cstrike/{ => cstrike}/sdk/svn_version.h | 0 .../cstrike/{ => cstrike}/sdk/svn_version.tpl | 0 dlls/csx/msvc/csx.sln | 29 --- dlls/csx/msvc/csx.vcproj | 214 ------------------ dlls/sven/{sven => }/CString.h | 0 dlls/sven/{sven => }/Trie.h | 0 dlls/sven/{sven => }/amxxmodule.cpp | 0 dlls/sven/{sven => }/amxxmodule.h | 0 dlls/sven/{sven => }/moduleconfig.cpp | 0 dlls/sven/{sven => }/moduleconfig.h | 0 dlls/sven/{sven => }/msvc7/svencoop.sln | 0 dlls/sven/{sven => }/msvc7/svencoop.vcproj | 34 +-- dlls/sven/{sven => }/svencoop.cpp | 0 dlls/sven/{sven => }/svencoop.h | 0 dlls/sven/{sven => }/svencoop.inc | 0 dlls/sven/{sven => }/svencoop_const.inc | 0 installer/AMXXRelease/AMXXRelease.exe | Bin 32768 -> 32768 bytes installer/AMXXRelease/ModCstrike.cs | 3 + installer/AMXXRelease/ModDoD.cs | 12 +- installer/AMXXRelease/ModTs.cs | 8 +- 32 files changed, 30 insertions(+), 274 deletions(-) rename dlls/cstrike/{ => cstrike}/CstrikePlayer.cpp (100%) rename dlls/cstrike/{ => cstrike}/CstrikePlayer.h (100%) rename dlls/cstrike/{ => cstrike}/Makefile (96%) rename dlls/cstrike/{ => cstrike}/cstrike.cpp (100%) rename dlls/cstrike/{ => cstrike}/cstrike.h (100%) rename dlls/cstrike/{ => cstrike}/msvc7/cstrike.sln (100%) rename dlls/cstrike/{ => cstrike}/msvc7/cstrike.vcproj (100%) rename dlls/cstrike/{ => cstrike}/msvc8/cstrike.sln (100%) rename dlls/cstrike/{ => cstrike}/msvc8/cstrike.vcproj (100%) rename dlls/cstrike/{ => cstrike}/sdk/amxxmodule.cpp (100%) rename dlls/cstrike/{ => cstrike}/sdk/amxxmodule.h (100%) rename dlls/cstrike/{ => cstrike}/sdk/moduleconfig.h (100%) rename dlls/cstrike/{ => cstrike}/sdk/svn_version.h (100%) rename dlls/cstrike/{ => cstrike}/sdk/svn_version.tpl (100%) delete mode 100755 dlls/csx/msvc/csx.sln delete mode 100755 dlls/csx/msvc/csx.vcproj rename dlls/sven/{sven => }/CString.h (100%) rename dlls/sven/{sven => }/Trie.h (100%) rename dlls/sven/{sven => }/amxxmodule.cpp (100%) rename dlls/sven/{sven => }/amxxmodule.h (100%) rename dlls/sven/{sven => }/moduleconfig.cpp (100%) rename dlls/sven/{sven => }/moduleconfig.h (100%) rename dlls/sven/{sven => }/msvc7/svencoop.sln (100%) rename dlls/sven/{sven => }/msvc7/svencoop.vcproj (89%) rename dlls/sven/{sven => }/svencoop.cpp (100%) rename dlls/sven/{sven => }/svencoop.h (100%) rename dlls/sven/{sven => }/svencoop.inc (100%) rename dlls/sven/{sven => }/svencoop_const.inc (100%) diff --git a/dlls/cstrike/CstrikePlayer.cpp b/dlls/cstrike/cstrike/CstrikePlayer.cpp similarity index 100% rename from dlls/cstrike/CstrikePlayer.cpp rename to dlls/cstrike/cstrike/CstrikePlayer.cpp diff --git a/dlls/cstrike/CstrikePlayer.h b/dlls/cstrike/cstrike/CstrikePlayer.h similarity index 100% rename from dlls/cstrike/CstrikePlayer.h rename to dlls/cstrike/cstrike/CstrikePlayer.h diff --git a/dlls/cstrike/Makefile b/dlls/cstrike/cstrike/Makefile similarity index 96% rename from dlls/cstrike/Makefile rename to dlls/cstrike/cstrike/Makefile index 1c99f149..7cc09193 100755 --- a/dlls/cstrike/Makefile +++ b/dlls/cstrike/cstrike/Makefile @@ -1,8 +1,8 @@ #(C)2004-2005 AMX Mod X Development Team # Makefile written by David "BAILOPAN" Anderson -HLSDK = ../../../hlsdk -MM_ROOT = ../../metamod/metamod +HLSDK = ../../../../hlsdk +MM_ROOT = ../../../metamod/metamod ### EDIT BELOW FOR OTHER PROJECTS ### diff --git a/dlls/cstrike/cstrike.cpp b/dlls/cstrike/cstrike/cstrike.cpp similarity index 100% rename from dlls/cstrike/cstrike.cpp rename to dlls/cstrike/cstrike/cstrike.cpp diff --git a/dlls/cstrike/cstrike.h b/dlls/cstrike/cstrike/cstrike.h similarity index 100% rename from dlls/cstrike/cstrike.h rename to dlls/cstrike/cstrike/cstrike.h diff --git a/dlls/cstrike/msvc7/cstrike.sln b/dlls/cstrike/cstrike/msvc7/cstrike.sln similarity index 100% rename from dlls/cstrike/msvc7/cstrike.sln rename to dlls/cstrike/cstrike/msvc7/cstrike.sln diff --git a/dlls/cstrike/msvc7/cstrike.vcproj b/dlls/cstrike/cstrike/msvc7/cstrike.vcproj similarity index 100% rename from dlls/cstrike/msvc7/cstrike.vcproj rename to dlls/cstrike/cstrike/msvc7/cstrike.vcproj diff --git a/dlls/cstrike/msvc8/cstrike.sln b/dlls/cstrike/cstrike/msvc8/cstrike.sln similarity index 100% rename from dlls/cstrike/msvc8/cstrike.sln rename to dlls/cstrike/cstrike/msvc8/cstrike.sln diff --git a/dlls/cstrike/msvc8/cstrike.vcproj b/dlls/cstrike/cstrike/msvc8/cstrike.vcproj similarity index 100% rename from dlls/cstrike/msvc8/cstrike.vcproj rename to dlls/cstrike/cstrike/msvc8/cstrike.vcproj diff --git a/dlls/cstrike/sdk/amxxmodule.cpp b/dlls/cstrike/cstrike/sdk/amxxmodule.cpp similarity index 100% rename from dlls/cstrike/sdk/amxxmodule.cpp rename to dlls/cstrike/cstrike/sdk/amxxmodule.cpp diff --git a/dlls/cstrike/sdk/amxxmodule.h b/dlls/cstrike/cstrike/sdk/amxxmodule.h similarity index 100% rename from dlls/cstrike/sdk/amxxmodule.h rename to dlls/cstrike/cstrike/sdk/amxxmodule.h diff --git a/dlls/cstrike/sdk/moduleconfig.h b/dlls/cstrike/cstrike/sdk/moduleconfig.h similarity index 100% rename from dlls/cstrike/sdk/moduleconfig.h rename to dlls/cstrike/cstrike/sdk/moduleconfig.h diff --git a/dlls/cstrike/sdk/svn_version.h b/dlls/cstrike/cstrike/sdk/svn_version.h similarity index 100% rename from dlls/cstrike/sdk/svn_version.h rename to dlls/cstrike/cstrike/sdk/svn_version.h diff --git a/dlls/cstrike/sdk/svn_version.tpl b/dlls/cstrike/cstrike/sdk/svn_version.tpl similarity index 100% rename from dlls/cstrike/sdk/svn_version.tpl rename to dlls/cstrike/cstrike/sdk/svn_version.tpl diff --git a/dlls/csx/msvc/csx.sln b/dlls/csx/msvc/csx.sln deleted file mode 100755 index 9b3355fc..00000000 --- a/dlls/csx/msvc/csx.sln +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "csx.vcproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\WinCSX\WinCSX.vcproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.ActiveCfg = Debug|Win32 - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.Build.0 = Debug|Win32 - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.ActiveCfg = Release|Win32 - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.Build.0 = Release|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug.ActiveCfg = Debug|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug.Build.0 = Debug|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release.ActiveCfg = Release|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/csx/msvc/csx.vcproj b/dlls/csx/msvc/csx.vcproj deleted file mode 100755 index 961a50ff..00000000 --- a/dlls/csx/msvc/csx.vcproj +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/sven/sven/CString.h b/dlls/sven/CString.h similarity index 100% rename from dlls/sven/sven/CString.h rename to dlls/sven/CString.h diff --git a/dlls/sven/sven/Trie.h b/dlls/sven/Trie.h similarity index 100% rename from dlls/sven/sven/Trie.h rename to dlls/sven/Trie.h diff --git a/dlls/sven/sven/amxxmodule.cpp b/dlls/sven/amxxmodule.cpp similarity index 100% rename from dlls/sven/sven/amxxmodule.cpp rename to dlls/sven/amxxmodule.cpp diff --git a/dlls/sven/sven/amxxmodule.h b/dlls/sven/amxxmodule.h similarity index 100% rename from dlls/sven/sven/amxxmodule.h rename to dlls/sven/amxxmodule.h diff --git a/dlls/sven/sven/moduleconfig.cpp b/dlls/sven/moduleconfig.cpp similarity index 100% rename from dlls/sven/sven/moduleconfig.cpp rename to dlls/sven/moduleconfig.cpp diff --git a/dlls/sven/sven/moduleconfig.h b/dlls/sven/moduleconfig.h similarity index 100% rename from dlls/sven/sven/moduleconfig.h rename to dlls/sven/moduleconfig.h diff --git a/dlls/sven/sven/msvc7/svencoop.sln b/dlls/sven/msvc7/svencoop.sln similarity index 100% rename from dlls/sven/sven/msvc7/svencoop.sln rename to dlls/sven/msvc7/svencoop.sln diff --git a/dlls/sven/sven/msvc7/svencoop.vcproj b/dlls/sven/msvc7/svencoop.vcproj similarity index 89% rename from dlls/sven/sven/msvc7/svencoop.vcproj rename to dlls/sven/msvc7/svencoop.vcproj index 72216192..4031b3ec 100644 --- a/dlls/sven/sven/msvc7/svencoop.vcproj +++ b/dlls/sven/msvc7/svencoop.vcproj @@ -35,7 +35,7 @@ BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4"/> + DebugInformationFormat="3"/> - - @@ -182,21 +179,28 @@ - - - - - - + + + + + + + + + + diff --git a/dlls/sven/sven/svencoop.cpp b/dlls/sven/svencoop.cpp similarity index 100% rename from dlls/sven/sven/svencoop.cpp rename to dlls/sven/svencoop.cpp diff --git a/dlls/sven/sven/svencoop.h b/dlls/sven/svencoop.h similarity index 100% rename from dlls/sven/sven/svencoop.h rename to dlls/sven/svencoop.h diff --git a/dlls/sven/sven/svencoop.inc b/dlls/sven/svencoop.inc similarity index 100% rename from dlls/sven/sven/svencoop.inc rename to dlls/sven/svencoop.inc diff --git a/dlls/sven/sven/svencoop_const.inc b/dlls/sven/svencoop_const.inc similarity index 100% rename from dlls/sven/sven/svencoop_const.inc rename to dlls/sven/svencoop_const.inc diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe index 30432d75b3d90d45bf84295cec2e9584cdf739ed..1874b889e6bd329cd494b2321c05718e1816b4d9 100755 GIT binary patch delta 1350 zcmaJ>ZAepL6n@^jnr?G*wwkWYk5iVDj96%`iQ9|@AmASfv4+%LBgbT0S4=Q-y*?{m(}<&DRMcw87e zDGYs2oGxJ75;waXnGv83WN{#1Nff(yG3#YfKFWM7Am3zNjv|pt6bsQS&^yxz*ZE| zg(tPw7-<=O@8m81W$X}_{K4F#w3XfiohIhyb(Xjtsr*xR-s;Os4ttS!#<17P*ADic z5v5@tt5J1WvB<+d@=ImwtriCcO_Gbge5kxoo?m{OF&~#JR;SwSZ5S&8 zoYapu*s-yR)@$_ZO*=(`^hb|HrCIvxi6|F4*1@I#x$pe2gEh=OQKk~A&WLvcN4*SsA#fIUFr zzm+@?9ye#~r-p|4hwx&nO>xz7p3_{ww>HO|SGRfYkAL47y71z`ujhAP56BbEBf^3} zL>XPPEfHFa62)#N%0sPJvd;@5cSN48`*{rbq}(UEO`QNrl{-bZ%u~QJ1JIf`3QU=j zfhq3ktG0%^o2<%J6zb-kef>=2_xijnpTF;$G>ORO5BgWxs!)y9^i%=zZ2v)KYNA9e lTAh=Uplw4Gy%nvs%thtTQHRYE0kS9?3CKBvU$YZ|jK9o82jTz# delta 1439 zcmZ`(ZAep57=F)P>^iqyr_0S*x=m@$&*n#JrfDfoQ$aAZABNi)R*)ZD`w&W;AX#D2 zIP|Y?gb)PH8$$Ib3JUT^DE>&aAO4B{ghfOV{^&jTLpP#xxjWDEp67Yrb6)OFB*H}^ z-0f@J_*nEtCb=J-?h={;03CoM0^l`7-B#)*J!FcGksRWcrb(CJilBszCVV-3T{S4p z1|WzJ0_f>?;*;7f?Y7KfjO+$T7L!acIAq1OL^0o}LL;5a*-L}PG|{J-Hk$4+3Hi7_;6%TN6YEX1E;p^?teSf$g{9StohTX61MJd^Lk#jVoM12! zp)51{r1zCO5H;>=GbnE#bYza z`uou1_@^Hu=vMo2he4$uPZ*5t$E+s9CTKEV+>m8zKWbg+wXn)EWwtIe&G%bon$J`j>+{M?Q#Q#=Q+AKWNuQ}q zEfHtjiZfd9%Z}Na$`s$E%(Q|tGSdpait{B@9aqvQ#z+-oZ{ZEF^UkU47^y>+a7bAz zMCOCrDyzdjmB5tB%19$JQ;jrVrq^-HZs|qEO)I4>hetEQa1Ng#=!P&1;9IhdhViph zV#Ck_LFj{Fe88Z^!2N%3FI<3r0K1}9SWFJH7N@S(X}Z*!)|Px8_YhZyS0b=yrwWU7 z1N&9;r|#gG>_)0@yJ%T`@T;cYJnUasc$9VK-Q|EZ*>;6X84R#)DdScEXIIp1BN3^% z{az9k0`HG}8wdEpZYy