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 30432d75..1874b889 100755
Binary files a/installer/AMXXRelease/AMXXRelease.exe and b/installer/AMXXRelease/AMXXRelease.exe differ
diff --git a/installer/AMXXRelease/ModCstrike.cs b/installer/AMXXRelease/ModCstrike.cs
index 26e5fa6a..3fa1f620 100755
--- a/installer/AMXXRelease/ModCstrike.cs
+++ b/installer/AMXXRelease/ModCstrike.cs
@@ -48,7 +48,10 @@ namespace AMXXRelease
private void AddModules()
{
Module csx = new Module("csx");
+ csx.sourcedir = "dlls\\cstrike\\csx";
+
Module cstrike = new Module("cstrike");
+ cstrike.sourcedir = "dlls\\cstrike\\cstrike";
m_Modules.Add(csx);
m_Modules.Add(cstrike);
diff --git a/installer/AMXXRelease/ModDoD.cs b/installer/AMXXRelease/ModDoD.cs
index 94aeb8c1..9b04d573 100755
--- a/installer/AMXXRelease/ModDoD.cs
+++ b/installer/AMXXRelease/ModDoD.cs
@@ -29,15 +29,11 @@ namespace AMXXRelease
private void AddModules()
{
- Module dodx = new Module();
- dodx.sourcedir = "dlls\\dod2\\dodx";
- dodx.projname = "dodx_amxx";
- dodx.vcproj = "dodx";
+ Module dodx = new Module("dodx");
+ dodx.sourcedir = "dlls\\dod\\dodx";
- Module dodfun = new Module();
- dodfun.sourcedir = "dlls\\dod2\\dodfun";
- dodfun.projname = "dodfun_amxx";
- dodfun.vcproj = "dodfun";
+ Module dodfun = new Module("dodfun");
+ dodfun.sourcedir = "dlls\\dod\\dodfun";
m_Modules.Add(dodx);
m_Modules.Add(dodfun);
diff --git a/installer/AMXXRelease/ModTs.cs b/installer/AMXXRelease/ModTs.cs
index da522530..8d318ae2 100755
--- a/installer/AMXXRelease/ModTs.cs
+++ b/installer/AMXXRelease/ModTs.cs
@@ -27,15 +27,11 @@ namespace AMXXRelease
private void AddModules()
{
- Module tsx = new Module();
+ Module tsx = new Module("tsx");
tsx.sourcedir = "dlls\\ts\\tsx";
- tsx.projname = "tsx_amxx";
- tsx.vcproj = "tsx";
- Module tsfun = new Module();
+ Module tsfun = new Module("tsfun");
tsfun.sourcedir = "dlls\\ts\\tsfun";
- tsfun.projname = "tsfun_amxx";
- tsfun.vcproj = "tsfun";
m_Modules.Add(tsx);
m_Modules.Add(tsfun);