diff --git a/dlls/csx/CMisc.cpp b/dlls/cstrike/csx/CMisc.cpp similarity index 100% rename from dlls/csx/CMisc.cpp rename to dlls/cstrike/csx/CMisc.cpp diff --git a/dlls/csx/CMisc.h b/dlls/cstrike/csx/CMisc.h similarity index 100% rename from dlls/csx/CMisc.h rename to dlls/cstrike/csx/CMisc.h diff --git a/dlls/csx/CRank.cpp b/dlls/cstrike/csx/CRank.cpp similarity index 100% rename from dlls/csx/CRank.cpp rename to dlls/cstrike/csx/CRank.cpp diff --git a/dlls/csx/CRank.h b/dlls/cstrike/csx/CRank.h similarity index 100% rename from dlls/csx/CRank.h rename to dlls/cstrike/csx/CRank.h diff --git a/dlls/csx/Makefile b/dlls/cstrike/csx/Makefile similarity index 96% rename from dlls/csx/Makefile rename to dlls/cstrike/csx/Makefile index 063e45cd..c1042fc5 100755 --- a/dlls/csx/Makefile +++ b/dlls/cstrike/csx/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/csx/WinCSX/CRank.cpp b/dlls/cstrike/csx/WinCSX/CRank.cpp similarity index 100% rename from dlls/csx/WinCSX/CRank.cpp rename to dlls/cstrike/csx/WinCSX/CRank.cpp diff --git a/dlls/csx/WinCSX/CRank.h b/dlls/cstrike/csx/WinCSX/CRank.h similarity index 100% rename from dlls/csx/WinCSX/CRank.h rename to dlls/cstrike/csx/WinCSX/CRank.h diff --git a/dlls/csx/WinCSX/Resource.h b/dlls/cstrike/csx/WinCSX/Resource.h similarity index 100% rename from dlls/csx/WinCSX/Resource.h rename to dlls/cstrike/csx/WinCSX/Resource.h diff --git a/dlls/csx/WinCSX/WinCSX.cpp b/dlls/cstrike/csx/WinCSX/WinCSX.cpp similarity index 100% rename from dlls/csx/WinCSX/WinCSX.cpp rename to dlls/cstrike/csx/WinCSX/WinCSX.cpp diff --git a/dlls/csx/WinCSX/WinCSX.exe.manifest b/dlls/cstrike/csx/WinCSX/WinCSX.exe.manifest similarity index 100% rename from dlls/csx/WinCSX/WinCSX.exe.manifest rename to dlls/cstrike/csx/WinCSX/WinCSX.exe.manifest diff --git a/dlls/csx/WinCSX/WinCSX.h b/dlls/cstrike/csx/WinCSX/WinCSX.h similarity index 100% rename from dlls/csx/WinCSX/WinCSX.h rename to dlls/cstrike/csx/WinCSX/WinCSX.h diff --git a/dlls/csx/WinCSX/WinCSX.ico b/dlls/cstrike/csx/WinCSX/WinCSX.ico similarity index 100% rename from dlls/csx/WinCSX/WinCSX.ico rename to dlls/cstrike/csx/WinCSX/WinCSX.ico diff --git a/dlls/csx/WinCSX/WinCSX.rc b/dlls/cstrike/csx/WinCSX/WinCSX.rc similarity index 100% rename from dlls/csx/WinCSX/WinCSX.rc rename to dlls/cstrike/csx/WinCSX/WinCSX.rc diff --git a/dlls/csx/WinCSX/WinCSX.vcproj b/dlls/cstrike/csx/WinCSX/WinCSX.vcproj similarity index 100% rename from dlls/csx/WinCSX/WinCSX.vcproj rename to dlls/cstrike/csx/WinCSX/WinCSX.vcproj diff --git a/dlls/csx/WinCSX/amxxmodule.h b/dlls/cstrike/csx/WinCSX/amxxmodule.h similarity index 100% rename from dlls/csx/WinCSX/amxxmodule.h rename to dlls/cstrike/csx/WinCSX/amxxmodule.h diff --git a/dlls/csx/WinCSX/moduleconfig.h b/dlls/cstrike/csx/WinCSX/moduleconfig.h similarity index 100% rename from dlls/csx/WinCSX/moduleconfig.h rename to dlls/cstrike/csx/WinCSX/moduleconfig.h diff --git a/dlls/csx/WinCSX/msvc8/WinCSX.vcproj b/dlls/cstrike/csx/WinCSX/msvc8/WinCSX.vcproj similarity index 100% rename from dlls/csx/WinCSX/msvc8/WinCSX.vcproj rename to dlls/cstrike/csx/WinCSX/msvc8/WinCSX.vcproj diff --git a/dlls/csx/WinCSX/small.ico b/dlls/cstrike/csx/WinCSX/small.ico similarity index 100% rename from dlls/csx/WinCSX/small.ico rename to dlls/cstrike/csx/WinCSX/small.ico diff --git a/dlls/csx/WinCSX/stdafx.cpp b/dlls/cstrike/csx/WinCSX/stdafx.cpp similarity index 100% rename from dlls/csx/WinCSX/stdafx.cpp rename to dlls/cstrike/csx/WinCSX/stdafx.cpp diff --git a/dlls/csx/WinCSX/stdafx.h b/dlls/cstrike/csx/WinCSX/stdafx.h similarity index 100% rename from dlls/csx/WinCSX/stdafx.h rename to dlls/cstrike/csx/WinCSX/stdafx.h diff --git a/dlls/csx/meta_api.cpp b/dlls/cstrike/csx/meta_api.cpp similarity index 100% rename from dlls/csx/meta_api.cpp rename to dlls/cstrike/csx/meta_api.cpp diff --git a/dlls/csx/msvc7/csx.sln b/dlls/cstrike/csx/msvc7/csx.sln similarity index 100% rename from dlls/csx/msvc7/csx.sln rename to dlls/cstrike/csx/msvc7/csx.sln diff --git a/dlls/csx/msvc7/csx.vcproj b/dlls/cstrike/csx/msvc7/csx.vcproj similarity index 100% rename from dlls/csx/msvc7/csx.vcproj rename to dlls/cstrike/csx/msvc7/csx.vcproj diff --git a/dlls/csx/msvc8/csx.sln b/dlls/cstrike/csx/msvc8/csx.sln similarity index 100% rename from dlls/csx/msvc8/csx.sln rename to dlls/cstrike/csx/msvc8/csx.sln diff --git a/dlls/csx/msvc8/csx.vcproj b/dlls/cstrike/csx/msvc8/csx.vcproj similarity index 100% rename from dlls/csx/msvc8/csx.vcproj rename to dlls/cstrike/csx/msvc8/csx.vcproj diff --git a/dlls/csx/rank.cpp b/dlls/cstrike/csx/rank.cpp similarity index 100% rename from dlls/csx/rank.cpp rename to dlls/cstrike/csx/rank.cpp diff --git a/dlls/csx/rank.h b/dlls/cstrike/csx/rank.h similarity index 100% rename from dlls/csx/rank.h rename to dlls/cstrike/csx/rank.h diff --git a/dlls/csx/sdk/amxxmodule.cpp b/dlls/cstrike/csx/sdk/amxxmodule.cpp similarity index 100% rename from dlls/csx/sdk/amxxmodule.cpp rename to dlls/cstrike/csx/sdk/amxxmodule.cpp diff --git a/dlls/csx/sdk/amxxmodule.h b/dlls/cstrike/csx/sdk/amxxmodule.h similarity index 100% rename from dlls/csx/sdk/amxxmodule.h rename to dlls/cstrike/csx/sdk/amxxmodule.h diff --git a/dlls/csx/sdk/moduleconfig.h b/dlls/cstrike/csx/sdk/moduleconfig.h similarity index 100% rename from dlls/csx/sdk/moduleconfig.h rename to dlls/cstrike/csx/sdk/moduleconfig.h diff --git a/dlls/csx/sdk/svn_version.h b/dlls/cstrike/csx/sdk/svn_version.h similarity index 100% rename from dlls/csx/sdk/svn_version.h rename to dlls/cstrike/csx/sdk/svn_version.h diff --git a/dlls/csx/sdk/svn_version.tpl b/dlls/cstrike/csx/sdk/svn_version.tpl similarity index 100% rename from dlls/csx/sdk/svn_version.tpl rename to dlls/cstrike/csx/sdk/svn_version.tpl diff --git a/dlls/csx/usermsg.cpp b/dlls/cstrike/csx/usermsg.cpp similarity index 100% rename from dlls/csx/usermsg.cpp rename to dlls/cstrike/csx/usermsg.cpp diff --git a/dlls/dod2/dodfun/CMisc.cpp b/dlls/dod/dodfun/CMisc.cpp similarity index 100% rename from dlls/dod2/dodfun/CMisc.cpp rename to dlls/dod/dodfun/CMisc.cpp diff --git a/dlls/dod2/dodfun/CMisc.h b/dlls/dod/dodfun/CMisc.h similarity index 100% rename from dlls/dod2/dodfun/CMisc.h rename to dlls/dod/dodfun/CMisc.h diff --git a/dlls/dod2/dodfun/Makefile b/dlls/dod/dodfun/Makefile similarity index 100% rename from dlls/dod2/dodfun/Makefile rename to dlls/dod/dodfun/Makefile diff --git a/dlls/dod2/dodfun/NBase.cpp b/dlls/dod/dodfun/NBase.cpp similarity index 100% rename from dlls/dod2/dodfun/NBase.cpp rename to dlls/dod/dodfun/NBase.cpp diff --git a/dlls/dod2/dodfun/NPD.cpp b/dlls/dod/dodfun/NPD.cpp similarity index 100% rename from dlls/dod2/dodfun/NPD.cpp rename to dlls/dod/dodfun/NPD.cpp diff --git a/dlls/dod2/dodfun/Utils.cpp b/dlls/dod/dodfun/Utils.cpp similarity index 100% rename from dlls/dod2/dodfun/Utils.cpp rename to dlls/dod/dodfun/Utils.cpp diff --git a/dlls/dod2/dodfun/dodfun.h b/dlls/dod/dodfun/dodfun.h similarity index 100% rename from dlls/dod2/dodfun/dodfun.h rename to dlls/dod/dodfun/dodfun.h diff --git a/dlls/dod2/dodfun/moduleconfig.cpp b/dlls/dod/dodfun/moduleconfig.cpp similarity index 100% rename from dlls/dod2/dodfun/moduleconfig.cpp rename to dlls/dod/dodfun/moduleconfig.cpp diff --git a/dlls/dod2/dodfun/msvc7/dodfun.sln b/dlls/dod/dodfun/msvc7/dodfun.sln similarity index 100% rename from dlls/dod2/dodfun/msvc7/dodfun.sln rename to dlls/dod/dodfun/msvc7/dodfun.sln diff --git a/dlls/dod2/dodfun/msvc7/dodfun.vcproj b/dlls/dod/dodfun/msvc7/dodfun.vcproj similarity index 100% rename from dlls/dod2/dodfun/msvc7/dodfun.vcproj rename to dlls/dod/dodfun/msvc7/dodfun.vcproj diff --git a/dlls/dod2/dodfun/msvc8/dodfun.sln b/dlls/dod/dodfun/msvc8/dodfun.sln similarity index 100% rename from dlls/dod2/dodfun/msvc8/dodfun.sln rename to dlls/dod/dodfun/msvc8/dodfun.sln diff --git a/dlls/dod2/dodfun/msvc8/dodfun.vcproj b/dlls/dod/dodfun/msvc8/dodfun.vcproj similarity index 100% rename from dlls/dod2/dodfun/msvc8/dodfun.vcproj rename to dlls/dod/dodfun/msvc8/dodfun.vcproj diff --git a/dlls/dod2/dodfun/sdk/amxxmodule.cpp b/dlls/dod/dodfun/sdk/amxxmodule.cpp similarity index 100% rename from dlls/dod2/dodfun/sdk/amxxmodule.cpp rename to dlls/dod/dodfun/sdk/amxxmodule.cpp diff --git a/dlls/dod2/dodfun/sdk/amxxmodule.h b/dlls/dod/dodfun/sdk/amxxmodule.h similarity index 100% rename from dlls/dod2/dodfun/sdk/amxxmodule.h rename to dlls/dod/dodfun/sdk/amxxmodule.h diff --git a/dlls/dod2/dodfun/sdk/moduleconfig.h b/dlls/dod/dodfun/sdk/moduleconfig.h similarity index 100% rename from dlls/dod2/dodfun/sdk/moduleconfig.h rename to dlls/dod/dodfun/sdk/moduleconfig.h diff --git a/dlls/dod2/dodfun/sdk/svn_version.h b/dlls/dod/dodfun/sdk/svn_version.h similarity index 100% rename from dlls/dod2/dodfun/sdk/svn_version.h rename to dlls/dod/dodfun/sdk/svn_version.h diff --git a/dlls/dod2/dodfun/sdk/svn_version.tpl b/dlls/dod/dodfun/sdk/svn_version.tpl similarity index 100% rename from dlls/dod2/dodfun/sdk/svn_version.tpl rename to dlls/dod/dodfun/sdk/svn_version.tpl diff --git a/dlls/dod2/dodfun/usermsg.cpp b/dlls/dod/dodfun/usermsg.cpp similarity index 100% rename from dlls/dod2/dodfun/usermsg.cpp rename to dlls/dod/dodfun/usermsg.cpp diff --git a/dlls/dod2/dodx/CMisc.cpp b/dlls/dod/dodx/CMisc.cpp similarity index 100% rename from dlls/dod2/dodx/CMisc.cpp rename to dlls/dod/dodx/CMisc.cpp diff --git a/dlls/dod2/dodx/CMisc.h b/dlls/dod/dodx/CMisc.h similarity index 100% rename from dlls/dod2/dodx/CMisc.h rename to dlls/dod/dodx/CMisc.h diff --git a/dlls/dod2/dodx/CRank.cpp b/dlls/dod/dodx/CRank.cpp similarity index 100% rename from dlls/dod2/dodx/CRank.cpp rename to dlls/dod/dodx/CRank.cpp diff --git a/dlls/dod2/dodx/CRank.h b/dlls/dod/dodx/CRank.h similarity index 100% rename from dlls/dod2/dodx/CRank.h rename to dlls/dod/dodx/CRank.h diff --git a/dlls/dod2/dodx/Makefile b/dlls/dod/dodx/Makefile similarity index 100% rename from dlls/dod2/dodx/Makefile rename to dlls/dod/dodx/Makefile diff --git a/dlls/dod2/dodx/NBase.cpp b/dlls/dod/dodx/NBase.cpp similarity index 100% rename from dlls/dod2/dodx/NBase.cpp rename to dlls/dod/dodx/NBase.cpp diff --git a/dlls/dod2/dodx/NRank.cpp b/dlls/dod/dodx/NRank.cpp similarity index 100% rename from dlls/dod2/dodx/NRank.cpp rename to dlls/dod/dodx/NRank.cpp diff --git a/dlls/dod2/dodx/Utils.cpp b/dlls/dod/dodx/Utils.cpp similarity index 100% rename from dlls/dod2/dodx/Utils.cpp rename to dlls/dod/dodx/Utils.cpp diff --git a/dlls/dod2/dodx/dodx.h b/dlls/dod/dodx/dodx.h similarity index 100% rename from dlls/dod2/dodx/dodx.h rename to dlls/dod/dodx/dodx.h diff --git a/dlls/dod2/dodx/moduleconfig.cpp b/dlls/dod/dodx/moduleconfig.cpp similarity index 100% rename from dlls/dod2/dodx/moduleconfig.cpp rename to dlls/dod/dodx/moduleconfig.cpp diff --git a/dlls/dod2/dodx/msvc7/dodx.sln b/dlls/dod/dodx/msvc7/dodx.sln similarity index 100% rename from dlls/dod2/dodx/msvc7/dodx.sln rename to dlls/dod/dodx/msvc7/dodx.sln diff --git a/dlls/dod2/dodx/msvc7/dodx.vcproj b/dlls/dod/dodx/msvc7/dodx.vcproj similarity index 100% rename from dlls/dod2/dodx/msvc7/dodx.vcproj rename to dlls/dod/dodx/msvc7/dodx.vcproj diff --git a/dlls/dod2/dodx/msvc8/dodx.sln b/dlls/dod/dodx/msvc8/dodx.sln similarity index 100% rename from dlls/dod2/dodx/msvc8/dodx.sln rename to dlls/dod/dodx/msvc8/dodx.sln diff --git a/dlls/dod2/dodx/msvc8/dodx.vcproj b/dlls/dod/dodx/msvc8/dodx.vcproj similarity index 100% rename from dlls/dod2/dodx/msvc8/dodx.vcproj rename to dlls/dod/dodx/msvc8/dodx.vcproj diff --git a/dlls/dod2/dodx/sdk/amxxmodule.cpp b/dlls/dod/dodx/sdk/amxxmodule.cpp similarity index 100% rename from dlls/dod2/dodx/sdk/amxxmodule.cpp rename to dlls/dod/dodx/sdk/amxxmodule.cpp diff --git a/dlls/dod2/dodx/sdk/amxxmodule.h b/dlls/dod/dodx/sdk/amxxmodule.h similarity index 100% rename from dlls/dod2/dodx/sdk/amxxmodule.h rename to dlls/dod/dodx/sdk/amxxmodule.h diff --git a/dlls/dod2/dodx/sdk/moduleconfig.h b/dlls/dod/dodx/sdk/moduleconfig.h similarity index 100% rename from dlls/dod2/dodx/sdk/moduleconfig.h rename to dlls/dod/dodx/sdk/moduleconfig.h diff --git a/dlls/dod2/dodx/sdk/svn_version.h b/dlls/dod/dodx/sdk/svn_version.h similarity index 100% rename from dlls/dod2/dodx/sdk/svn_version.h rename to dlls/dod/dodx/sdk/svn_version.h diff --git a/dlls/dod2/dodx/sdk/svn_version.tpl b/dlls/dod/dodx/sdk/svn_version.tpl similarity index 100% rename from dlls/dod2/dodx/sdk/svn_version.tpl rename to dlls/dod/dodx/sdk/svn_version.tpl diff --git a/dlls/dod2/dodx/usermsg.cpp b/dlls/dod/dodx/usermsg.cpp similarity index 100% rename from dlls/dod2/dodx/usermsg.cpp rename to dlls/dod/dodx/usermsg.cpp diff --git a/dlls/sven/msvc7/svencoop.sln b/dlls/sven/msvc7/svencoop.sln index 348a94a0..9911917d 100644 --- a/dlls/sven/msvc7/svencoop.sln +++ b/dlls/sven/msvc7/svencoop.sln @@ -6,14 +6,13 @@ EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug - Profile = Profile Release = Release EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug.ActiveCfg = Debug|Win32 {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug.Build.0 = Debug|Win32 - {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Profile.ActiveCfg = Release|Win32 - {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Profile.Build.0 = Release|Win32 {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release.ActiveCfg = Release|Win32 {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release.Build.0 = Release|Win32 EndGlobalSection diff --git a/dlls/sven/msvc7/svencoop.vcproj b/dlls/sven/msvc7/svencoop.vcproj index 4031b3ec..54a99c06 100644 --- a/dlls/sven/msvc7/svencoop.vcproj +++ b/dlls/sven/msvc7/svencoop.vcproj @@ -23,7 +23,7 @@ + RelativePath="..\sdk\moduleconfig.h"> - - - - - - + RelativePath="..\sdk\CString.h"> + + + + + + + + + + + + diff --git a/dlls/sven/msvc8/svencoop.sln b/dlls/sven/msvc8/svencoop.sln new file mode 100644 index 00000000..492c05ef --- /dev/null +++ b/dlls/sven/msvc8/svencoop.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svencoop", "svencoop.vcproj", "{AB148B92-4F47-42E6-8268-AB4E588EC6A2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug|Win32.ActiveCfg = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug|Win32.Build.0 = Debug|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release|Win32.ActiveCfg = Release|Win32 + {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/dlls/sven/msvc8/svencoop.vcproj b/dlls/sven/msvc8/svencoop.vcproj new file mode 100644 index 00000000..0fb7c763 --- /dev/null +++ b/dlls/sven/msvc8/svencoop.vcproj @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/sven/CString.h b/dlls/sven/sdk/CString.h similarity index 100% rename from dlls/sven/CString.h rename to dlls/sven/sdk/CString.h diff --git a/dlls/sven/amxxmodule.cpp b/dlls/sven/sdk/amxxmodule.cpp similarity index 100% rename from dlls/sven/amxxmodule.cpp rename to dlls/sven/sdk/amxxmodule.cpp diff --git a/dlls/sven/amxxmodule.h b/dlls/sven/sdk/amxxmodule.h similarity index 100% rename from dlls/sven/amxxmodule.h rename to dlls/sven/sdk/amxxmodule.h diff --git a/dlls/sven/moduleconfig.h b/dlls/sven/sdk/moduleconfig.h similarity index 100% rename from dlls/sven/moduleconfig.h rename to dlls/sven/sdk/moduleconfig.h