diff --git a/amxmodx/msvc/.cvsignore b/amxmodx/msvc/.cvsignore deleted file mode 100755 index a1cb4ee9..00000000 --- a/amxmodx/msvc/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -amxmodx.sln -amxmodx.suo -amxmodx.aps -amxmodx.ncb -Debug -JITDebug -JITMemtestRelease -JITRelease -MaximalSpeed -MemtestDebug -MemtestRelease -Release \ No newline at end of file diff --git a/amxmodx/msvc/amxmodx_mm.dsp b/amxmodx/msvc/amxmodx_mm.dsp deleted file mode 100755 index 7ca7ccfe..00000000 --- a/amxmodx/msvc/amxmodx_mm.dsp +++ /dev/null @@ -1,292 +0,0 @@ -# Microsoft Developer Studio Project File - Name="amxmodx_mm" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=amxmodx_mm - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "amxmodx_mm.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "amxmodx_mm.mak" CFG="amxmodx_mm - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "amxmodx_mm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "amxmodx_mm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "amxmodx_mm - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "release" -# PROP Intermediate_Dir "release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\metamod\metamod" /I "..\..\hlsdk\sourcecode\common" /I "..\..\hlsdk\sourcecode\engine" /I "..\..\hlsdk\sourcecode\dlls" /I "..\..\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /def:".\amxmodx_mm.def" /out:"release/amxx_mm.dll" /libpath:"..\extra\lib_win32" -# Begin Custom Build -TargetPath=.\release\amxx_mm.dll -TargetName=amxx_mm -InputPath=.\release\amxx_mm.dll -SOURCE="$(InputPath)" - -"$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) D:\SIERRA\Half-Life\cstrike\addons\amx\dlls - -# End Custom Build - -!ELSEIF "$(CFG)" == "amxmodx_mm - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "debug" -# PROP Intermediate_Dir "debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /Zp4 /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod\metamod" /I "..\...\hlsdk\sourcecode\common" /I "..\...\hlsdk\sourcecode\engine" /I "..\...\hlsdk\sourcecode\dlls" /I "..\...\hlsdk\sourcecode\pm_shared" /I "..\extra\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "amxmodx_mm_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /def:".\amxmodx_mm.def" /out:"debug/amxx_mm.dll" /pdbtype:sept /libpath:"..\extra\lib_win32" -# SUBTRACT LINK32 /incremental:no /nodefaultlib -# Begin Custom Build -TargetPath=.\debug\amxx_mm.dll -TargetName=amxx_mm -InputPath=.\debug\amxx_mm.dll -SOURCE="$(InputPath)" - -"$(TargetName)" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - copy $(TargetPath) D:\SIERRA\Half-Life\cstrike\addons\amx\dlls - -# End Custom Build - -!ENDIF - -# Begin Target - -# Name "amxmodx_mm - Win32 Release" -# Name "amxmodx_mm - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\amx.c -# End Source File -# Begin Source File - -SOURCE=..\amxcore.c -# End Source File -# Begin Source File - -SOURCE=..\amxmodx.cpp -# End Source File -# Begin Source File - -SOURCE=..\amxtime.c -# End Source File -# Begin Source File - -SOURCE=..\amxxlog.cpp -# End Source File -# Begin Source File - -SOURCE=..\CCmd.cpp -# End Source File -# Begin Source File - -SOURCE=..\CEvent.cpp -# End Source File -# Begin Source File - -SOURCE=..\CFile.cpp -# End Source File -# Begin Source File - -SOURCE=..\CForward.cpp -# End Source File -# Begin Source File - -SOURCE=..\CLogEvent.cpp -# End Source File -# Begin Source File - -SOURCE=..\CMenu.cpp -# End Source File -# Begin Source File - -SOURCE=..\CMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\CModule.cpp -# End Source File -# Begin Source File - -SOURCE=..\CPlugin.cpp -# End Source File -# Begin Source File - -SOURCE=..\CString.cpp -# End Source File -# Begin Source File - -SOURCE=..\CTask.cpp -# End Source File -# Begin Source File - -SOURCE=..\CVault.cpp -# End Source File -# Begin Source File - -SOURCE=..\emsg.cpp -# End Source File -# Begin Source File - -SOURCE=..\file.cpp -# End Source File -# Begin Source File - -SOURCE=..\float.cpp -# End Source File -# Begin Source File - -SOURCE=..\meta_api.cpp -# End Source File -# Begin Source File - -SOURCE=..\modules.cpp -# End Source File -# Begin Source File - -SOURCE=..\power.c -# End Source File -# Begin Source File - -SOURCE=..\srvcmd.cpp -# End Source File -# Begin Source File - -SOURCE=..\string.cpp -# End Source File -# Begin Source File - -SOURCE=..\strptime.cpp -# End Source File -# Begin Source File - -SOURCE=..\util.cpp -# End Source File -# Begin Source File - -SOURCE=..\vault.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\amxmodx.h -# End Source File -# Begin Source File - -SOURCE=..\CCmd.h -# End Source File -# Begin Source File - -SOURCE=..\CEvent.h -# End Source File -# Begin Source File - -SOURCE=..\CFile.h -# End Source File -# Begin Source File - -SOURCE=..\CForward.h -# End Source File -# Begin Source File - -SOURCE=..\CList.h -# End Source File -# Begin Source File - -SOURCE=..\CLogEvent.h -# End Source File -# Begin Source File - -SOURCE=..\CMenu.h -# End Source File -# Begin Source File - -SOURCE=..\CMisc.h -# End Source File -# Begin Source File - -SOURCE=..\CModule.h -# End Source File -# Begin Source File - -SOURCE=..\CPlugin.h -# End Source File -# Begin Source File - -SOURCE=..\CString.h -# End Source File -# Begin Source File - -SOURCE=..\CTask.h -# End Source File -# Begin Source File - -SOURCE=..\CVault.h -# End Source File -# Begin Source File - -SOURCE=..\modules.h -# End Source File -# End Group -# End Target -# End Project diff --git a/amxmodx/msvc/amxmodx_mm.dsw b/amxmodx/msvc/amxmodx_mm.dsw deleted file mode 100755 index a6072c5d..00000000 --- a/amxmodx/msvc/amxmodx_mm.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "amxmodx_mm"=.\amxmodx_mm.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/amxmodx/msvc/amxmodx_mm.sln b/amxmodx/msvc7/amxmodx_mm.sln similarity index 100% rename from amxmodx/msvc/amxmodx_mm.sln rename to amxmodx/msvc7/amxmodx_mm.sln diff --git a/amxmodx/msvc/amxmodx_mm.vcproj b/amxmodx/msvc7/amxmodx_mm.vcproj similarity index 88% rename from amxmodx/msvc/amxmodx_mm.vcproj rename to amxmodx/msvc7/amxmodx_mm.vcproj index a8db48ce..1ec81d26 100755 --- a/amxmodx/msvc/amxmodx_mm.vcproj +++ b/amxmodx/msvc7/amxmodx_mm.vcproj @@ -621,9 +621,6 @@ - - @@ -694,6 +691,92 @@ RelativePath="..\sdk\moduleconfig.h"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/amxmodx/msvc8/amxmodx_mm.vcproj b/amxmodx/msvc8/amxmodx_mm.vcproj index bea7858e..13125410 100644 --- a/amxmodx/msvc8/amxmodx_mm.vcproj +++ b/amxmodx/msvc8/amxmodx_mm.vcproj @@ -936,6 +936,118 @@ > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/cstrike/Makefile b/dlls/cstrike/Makefile index 55429fb0..1c99f149 100755 --- a/dlls/cstrike/Makefile +++ b/dlls/cstrike/Makefile @@ -14,12 +14,12 @@ NAME = cstrike BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX_64 = amxx_amd64.so -OBJECTS = CstrikePlayer.cpp cstrike.cpp amxxmodule.cpp +OBJECTS = sdk/amxxmodule.cpp CstrikePlayer.cpp cstrike.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -53,6 +53,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) cstrike amd64: @@ -67,9 +68,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/cstrike/cstrike.dsp b/dlls/cstrike/cstrike.dsp deleted file mode 100755 index def0b6ff..00000000 --- a/dlls/cstrike/cstrike.dsp +++ /dev/null @@ -1,143 +0,0 @@ -# Microsoft Developer Studio Project File - Name="cstrike" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=cstrike - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "cstrike.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "cstrike.mak" CFG="cstrike - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "cstrike - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "cstrike - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "cstrike - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSTRIKE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSTRIKE_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x41d /d "NDEBUG" -# ADD RSC /l 0x41d /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=echo Copying dll... copy Release\cstrike.dll K:\S\cstrike\addons\amxx\modules\cstrike_amx.dll echo Copying inc... copy ..\plugins\include\cstrike.inc K:\S\cstrike\addons\amxx\scripting\include\ -# End Special Build Tool - -!ELSEIF "$(CFG)" == "cstrike - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSTRIKE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "CSTRIKE_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x41d /d "_DEBUG" -# ADD RSC /l 0x41d /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/cstrike_amx.dll" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy Debug\cstrike_amx.dll k:\s\cstrike\addons\amxx\modules\ copy ..\plugins\include\cstrike.inc k:\s\cstrike\addons\amxx\scripting\include\ -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "cstrike - Win32 Release" -# Name "cstrike - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=.\cstrike.cpp -# End Source File -# Begin Source File - -SOURCE=.\CstrikePlayer.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=.\cstrike.h -# End Source File -# Begin Source File - -SOURCE=.\CstrikePlayer.h -# End Source File -# Begin Source File - -SOURCE=.\moduleconfig.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=..\plugins\include\cstrike.inc -# End Source File -# End Target -# End Project diff --git a/dlls/cstrike/cstrike.dsw b/dlls/cstrike/cstrike.dsw deleted file mode 100755 index b045a9ba..00000000 --- a/dlls/cstrike/cstrike.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "cstrike"=".\cstrike.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/dlls/cstrike/cstrike.sln b/dlls/cstrike/msvc7/cstrike.sln similarity index 100% rename from dlls/cstrike/cstrike.sln rename to dlls/cstrike/msvc7/cstrike.sln diff --git a/dlls/cstrike/cstrike.vcproj b/dlls/cstrike/msvc7/cstrike.vcproj similarity index 73% rename from dlls/cstrike/cstrike.vcproj rename to dlls/cstrike/msvc7/cstrike.vcproj index 9dddc760..bc89ad12 100755 --- a/dlls/cstrike/cstrike.vcproj +++ b/dlls/cstrike/msvc7/cstrike.vcproj @@ -22,6 +22,7 @@ + DebugInformationFormat="3"/> - - - - - - + RelativePath="..\cstrike.cpp"> - - - - - - + RelativePath="..\CstrikePlayer.cpp"> + RelativePath="..\cstrike.h"> + RelativePath="..\CstrikePlayer.h"> - - + RelativePath="..\sdk\moduleconfig.h"> + RelativePath="..\sdk\svn_version.h"> + + + + + + + + + RelativePath="..\..\..\plugins\include\cstrike.inc"> - - diff --git a/dlls/cstrike/msvc8/cstrike.vcproj b/dlls/cstrike/msvc8/cstrike.vcproj index 1516b042..24011dff 100644 --- a/dlls/cstrike/msvc8/cstrike.vcproj +++ b/dlls/cstrike/msvc8/cstrike.vcproj @@ -48,6 +48,7 @@ - - - - - - - - - - - - + + + + + + + + + + - - - - - - diff --git a/dlls/cstrike/amxxmodule.cpp b/dlls/cstrike/sdk/amxxmodule.cpp similarity index 100% rename from dlls/cstrike/amxxmodule.cpp rename to dlls/cstrike/sdk/amxxmodule.cpp diff --git a/dlls/cstrike/amxxmodule.h b/dlls/cstrike/sdk/amxxmodule.h similarity index 100% rename from dlls/cstrike/amxxmodule.h rename to dlls/cstrike/sdk/amxxmodule.h diff --git a/dlls/cstrike/moduleconfig.h b/dlls/cstrike/sdk/moduleconfig.h similarity index 100% rename from dlls/cstrike/moduleconfig.h rename to dlls/cstrike/sdk/moduleconfig.h diff --git a/dlls/cstrike/svn_version.h b/dlls/cstrike/sdk/svn_version.h similarity index 100% rename from dlls/cstrike/svn_version.h rename to dlls/cstrike/sdk/svn_version.h diff --git a/dlls/cstrike/svn_version.tpl b/dlls/cstrike/sdk/svn_version.tpl similarity index 100% rename from dlls/cstrike/svn_version.tpl rename to dlls/cstrike/sdk/svn_version.tpl diff --git a/dlls/csx/source/CMisc.cpp b/dlls/csx/CMisc.cpp similarity index 100% rename from dlls/csx/source/CMisc.cpp rename to dlls/csx/CMisc.cpp diff --git a/dlls/csx/source/CMisc.h b/dlls/csx/CMisc.h similarity index 100% rename from dlls/csx/source/CMisc.h rename to dlls/csx/CMisc.h diff --git a/dlls/csx/source/CRank.cpp b/dlls/csx/CRank.cpp similarity index 100% rename from dlls/csx/source/CRank.cpp rename to dlls/csx/CRank.cpp diff --git a/dlls/csx/source/CRank.h b/dlls/csx/CRank.h similarity index 100% rename from dlls/csx/source/CRank.h rename to dlls/csx/CRank.h diff --git a/dlls/csx/source/Makefile b/dlls/csx/Makefile similarity index 86% rename from dlls/csx/source/Makefile rename to dlls/csx/Makefile index 9909228e..063e45cd 100755 --- a/dlls/csx/source/Makefile +++ b/dlls/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 ### @@ -14,12 +14,12 @@ NAME = csx BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX_64 = amxx_amd64.so -OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp meta_api.cpp rank.cpp usermsg.cpp +OBJECTS = sdk/mxxmodule.cpp CRank.cpp CMisc.cpp meta_api.cpp rank.cpp usermsg.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -53,6 +53,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) csx amd64: @@ -67,9 +68,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/csx/source/WinCSX/CRank.cpp b/dlls/csx/WinCSX/CRank.cpp similarity index 100% rename from dlls/csx/source/WinCSX/CRank.cpp rename to dlls/csx/WinCSX/CRank.cpp diff --git a/dlls/csx/source/WinCSX/CRank.h b/dlls/csx/WinCSX/CRank.h similarity index 100% rename from dlls/csx/source/WinCSX/CRank.h rename to dlls/csx/WinCSX/CRank.h diff --git a/dlls/csx/source/WinCSX/Resource.h b/dlls/csx/WinCSX/Resource.h similarity index 100% rename from dlls/csx/source/WinCSX/Resource.h rename to dlls/csx/WinCSX/Resource.h diff --git a/dlls/csx/source/WinCSX/WinCSX.cpp b/dlls/csx/WinCSX/WinCSX.cpp similarity index 100% rename from dlls/csx/source/WinCSX/WinCSX.cpp rename to dlls/csx/WinCSX/WinCSX.cpp diff --git a/dlls/csx/source/WinCSX/WinCSX.exe.manifest b/dlls/csx/WinCSX/WinCSX.exe.manifest similarity index 100% rename from dlls/csx/source/WinCSX/WinCSX.exe.manifest rename to dlls/csx/WinCSX/WinCSX.exe.manifest diff --git a/dlls/csx/source/WinCSX/WinCSX.h b/dlls/csx/WinCSX/WinCSX.h similarity index 100% rename from dlls/csx/source/WinCSX/WinCSX.h rename to dlls/csx/WinCSX/WinCSX.h diff --git a/dlls/csx/source/WinCSX/WinCSX.ico b/dlls/csx/WinCSX/WinCSX.ico similarity index 100% rename from dlls/csx/source/WinCSX/WinCSX.ico rename to dlls/csx/WinCSX/WinCSX.ico diff --git a/dlls/csx/source/WinCSX/WinCSX.rc b/dlls/csx/WinCSX/WinCSX.rc similarity index 100% rename from dlls/csx/source/WinCSX/WinCSX.rc rename to dlls/csx/WinCSX/WinCSX.rc diff --git a/dlls/csx/source/WinCSX/WinCSX.vcproj b/dlls/csx/WinCSX/WinCSX.vcproj similarity index 100% rename from dlls/csx/source/WinCSX/WinCSX.vcproj rename to dlls/csx/WinCSX/WinCSX.vcproj diff --git a/dlls/csx/source/WinCSX/amxxmodule.h b/dlls/csx/WinCSX/amxxmodule.h similarity index 100% rename from dlls/csx/source/WinCSX/amxxmodule.h rename to dlls/csx/WinCSX/amxxmodule.h diff --git a/dlls/csx/source/WinCSX/moduleconfig.h b/dlls/csx/WinCSX/moduleconfig.h similarity index 100% rename from dlls/csx/source/WinCSX/moduleconfig.h rename to dlls/csx/WinCSX/moduleconfig.h diff --git a/dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj b/dlls/csx/WinCSX/msvc8/WinCSX.vcproj similarity index 100% rename from dlls/csx/source/WinCSX/msvc8/WinCSX.vcproj rename to dlls/csx/WinCSX/msvc8/WinCSX.vcproj diff --git a/dlls/csx/source/WinCSX/small.ico b/dlls/csx/WinCSX/small.ico similarity index 100% rename from dlls/csx/source/WinCSX/small.ico rename to dlls/csx/WinCSX/small.ico diff --git a/dlls/csx/source/WinCSX/stdafx.cpp b/dlls/csx/WinCSX/stdafx.cpp similarity index 100% rename from dlls/csx/source/WinCSX/stdafx.cpp rename to dlls/csx/WinCSX/stdafx.cpp diff --git a/dlls/csx/source/WinCSX/stdafx.h b/dlls/csx/WinCSX/stdafx.h similarity index 100% rename from dlls/csx/source/WinCSX/stdafx.h rename to dlls/csx/WinCSX/stdafx.h diff --git a/dlls/csx/source/meta_api.cpp b/dlls/csx/meta_api.cpp similarity index 100% rename from dlls/csx/source/meta_api.cpp rename to dlls/csx/meta_api.cpp diff --git a/dlls/csx/source/msvc/csx.sln b/dlls/csx/msvc/csx.sln similarity index 100% rename from dlls/csx/source/msvc/csx.sln rename to dlls/csx/msvc/csx.sln diff --git a/dlls/csx/msvc/csx.vcproj b/dlls/csx/msvc/csx.vcproj new file mode 100755 index 00000000..961a50ff --- /dev/null +++ b/dlls/csx/msvc/csx.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/csx/source/msvc8/csx.sln b/dlls/csx/msvc8/csx.sln similarity index 100% rename from dlls/csx/source/msvc8/csx.sln rename to dlls/csx/msvc8/csx.sln diff --git a/dlls/csx/msvc8/csx.vcproj b/dlls/csx/msvc8/csx.vcproj new file mode 100644 index 00000000..226331e9 --- /dev/null +++ b/dlls/csx/msvc8/csx.vcproj @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/csx/source/rank.cpp b/dlls/csx/rank.cpp similarity index 100% rename from dlls/csx/source/rank.cpp rename to dlls/csx/rank.cpp diff --git a/dlls/csx/source/rank.h b/dlls/csx/rank.h similarity index 100% rename from dlls/csx/source/rank.h rename to dlls/csx/rank.h diff --git a/dlls/csx/source/amxxmodule.cpp b/dlls/csx/sdk/amxxmodule.cpp similarity index 100% rename from dlls/csx/source/amxxmodule.cpp rename to dlls/csx/sdk/amxxmodule.cpp diff --git a/dlls/csx/source/amxxmodule.h b/dlls/csx/sdk/amxxmodule.h similarity index 100% rename from dlls/csx/source/amxxmodule.h rename to dlls/csx/sdk/amxxmodule.h diff --git a/dlls/csx/source/moduleconfig.h b/dlls/csx/sdk/moduleconfig.h similarity index 100% rename from dlls/csx/source/moduleconfig.h rename to dlls/csx/sdk/moduleconfig.h diff --git a/dlls/csx/source/svn_version.h b/dlls/csx/sdk/svn_version.h similarity index 100% rename from dlls/csx/source/svn_version.h rename to dlls/csx/sdk/svn_version.h diff --git a/dlls/csx/source/svn_version.tpl b/dlls/csx/sdk/svn_version.tpl similarity index 100% rename from dlls/csx/source/svn_version.tpl rename to dlls/csx/sdk/svn_version.tpl diff --git a/dlls/csx/source/compile.bat b/dlls/csx/source/compile.bat deleted file mode 100755 index 60e889c2..00000000 --- a/dlls/csx/source/compile.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -PATH=D:\gcc\bin;%PATH% - -make - -pause diff --git a/dlls/csx/source/msvc/csx.dsp b/dlls/csx/source/msvc/csx.dsp deleted file mode 100755 index 61ae768d..00000000 --- a/dlls/csx/source/msvc/csx.dsp +++ /dev/null @@ -1,149 +0,0 @@ -# Microsoft Developer Studio Project File - Name="csx" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=csx - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "csx.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "csx.mak" CFG="csx - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "csx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "csx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "csx - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "release" -# PROP Intermediate_Dir "release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /YX /FD /c -# ADD CPP /nologo /Zp4 /MT /W3 /GX /O2 /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /D "JIT" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/csx_amxx.dll" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "csx - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "debug" -# PROP Intermediate_Dir "debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /I "..\..\hlsdk\sourcecode\pm_shared" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "csx_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"debug/csx_amxx.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "csx - Win32 Release" -# Name "csx - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=..\CMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\CRank.cpp -# End Source File -# Begin Source File - -SOURCE=..\meta_api.cpp -# End Source File -# Begin Source File - -SOURCE=..\rank.cpp -# End Source File -# Begin Source File - -SOURCE=..\usermsg.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=..\CMisc.h -# End Source File -# Begin Source File - -SOURCE=..\CRank.h -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.h -# End Source File -# Begin Source File - -SOURCE=..\rank.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/dlls/csx/source/msvc/csx.dsw b/dlls/csx/source/msvc/csx.dsw deleted file mode 100755 index e26c89ab..00000000 --- a/dlls/csx/source/msvc/csx.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "csx"=.\csx.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/dlls/csx/source/msvc/csx.vcproj b/dlls/csx/source/msvc/csx.vcproj deleted file mode 100755 index 28e27ca5..00000000 --- a/dlls/csx/source/msvc/csx.vcproj +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/csx/source/msvc8/csx.vcproj b/dlls/csx/source/msvc8/csx.vcproj deleted file mode 100644 index 08b6a7c5..00000000 --- a/dlls/csx/source/msvc8/csx.vcproj +++ /dev/null @@ -1,409 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/csx/source/usermsg.cpp b/dlls/csx/usermsg.cpp similarity index 100% rename from dlls/csx/source/usermsg.cpp rename to dlls/csx/usermsg.cpp diff --git a/dlls/dod2/dodfun/Makefile b/dlls/dod2/dodfun/Makefile index e7cd66af..9d09510d 100755 --- a/dlls/dod2/dodfun/Makefile +++ b/dlls/dod2/dodfun/Makefile @@ -13,12 +13,12 @@ NAME = dodfun BIN_SUFFIX = amxx_i386.so -OBJECTS = amxxmodule.cpp NBase.cpp CMisc.cpp NPD.cpp Utils.cpp usermsg.cpp moduleconfig.cpp +OBJECTS = sdk/amxxmodule.cpp NBase.cpp CMisc.cpp NPD.cpp Utils.cpp usermsg.cpp moduleconfig.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -47,6 +47,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) dodfun dodfun: $(OBJ_LINUX) @@ -58,7 +59,9 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX) diff --git a/dlls/dod2/dodfun/compile.bat b/dlls/dod2/dodfun/compile.bat deleted file mode 100755 index 80424108..00000000 --- a/dlls/dod2/dodfun/compile.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -PATH=C:\gcc\bin;%PATH% - -make - -pause diff --git a/dlls/dod2/dodfun/msvc/dodfun.dsp b/dlls/dod2/dodfun/msvc/dodfun.dsp deleted file mode 100755 index f0291436..00000000 --- a/dlls/dod2/dodfun/msvc/dodfun.dsp +++ /dev/null @@ -1,149 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dodfun" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=dodfun - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dodfun.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dodfun.mak" CFG="dodfun - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dodfun - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "dodfun - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dodfun - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "release" -# PROP Intermediate_Dir "release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "dodfun_EXPORTS" /YX /FD /c -# ADD CPP /nologo /Zp4 /MT /W3 /GX /O2 /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "dodfun_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/dodfun_amxx.dll" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "dodfun - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "debug" -# PROP Intermediate_Dir "debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "dodfun_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\amx" /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "dodfun_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"debug/dodfun_amxx.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "dodfun - Win32 Release" -# Name "dodfun - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=..\CMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.cpp -# End Source File -# Begin Source File - -SOURCE=..\NBase.cpp -# End Source File -# Begin Source File - -SOURCE=..\NPD.cpp -# End Source File -# Begin Source File - -SOURCE=..\usermsg.cpp -# End Source File -# Begin Source File - -SOURCE=..\Utils.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=..\CMisc.h -# End Source File -# Begin Source File - -SOURCE=..\dodfun.h -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/dlls/dod2/dodfun/msvc/dodfun.dsw b/dlls/dod2/dodfun/msvc/dodfun.dsw deleted file mode 100755 index 8f7650e4..00000000 --- a/dlls/dod2/dodfun/msvc/dodfun.dsw +++ /dev/null @@ -1,30 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "dodfun"=.\dodfun.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - - diff --git a/dlls/dod2/dodfun/msvc/dodfun.vcproj b/dlls/dod2/dodfun/msvc/dodfun.vcproj deleted file mode 100755 index 554f5613..00000000 --- a/dlls/dod2/dodfun/msvc/dodfun.vcproj +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/dod2/dodfun/msvc/dodfun.sln b/dlls/dod2/dodfun/msvc7/dodfun.sln similarity index 100% rename from dlls/dod2/dodfun/msvc/dodfun.sln rename to dlls/dod2/dodfun/msvc7/dodfun.sln diff --git a/dlls/dod2/dodfun/msvc7/dodfun.vcproj b/dlls/dod2/dodfun/msvc7/dodfun.vcproj new file mode 100755 index 00000000..6af8f979 --- /dev/null +++ b/dlls/dod2/dodfun/msvc7/dodfun.vcproj @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/dod2/dodfun/msvc8/dodfun.vcproj b/dlls/dod2/dodfun/msvc8/dodfun.vcproj index 91ac8bca..ee83fbc0 100644 --- a/dlls/dod2/dodfun/msvc8/dodfun.vcproj +++ b/dlls/dod2/dodfun/msvc8/dodfun.vcproj @@ -16,8 +16,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -420,15 +251,42 @@ RelativePath="..\dodfun.h" > - - + + + + + + + + + + + + + + + + diff --git a/dlls/dod2/dodfun/amxxmodule.cpp b/dlls/dod2/dodfun/sdk/amxxmodule.cpp similarity index 100% rename from dlls/dod2/dodfun/amxxmodule.cpp rename to dlls/dod2/dodfun/sdk/amxxmodule.cpp diff --git a/dlls/dod2/dodfun/amxxmodule.h b/dlls/dod2/dodfun/sdk/amxxmodule.h similarity index 100% rename from dlls/dod2/dodfun/amxxmodule.h rename to dlls/dod2/dodfun/sdk/amxxmodule.h diff --git a/dlls/dod2/dodfun/moduleconfig.h b/dlls/dod2/dodfun/sdk/moduleconfig.h similarity index 100% rename from dlls/dod2/dodfun/moduleconfig.h rename to dlls/dod2/dodfun/sdk/moduleconfig.h diff --git a/dlls/dod2/dodfun/svn_version.h b/dlls/dod2/dodfun/sdk/svn_version.h similarity index 100% rename from dlls/dod2/dodfun/svn_version.h rename to dlls/dod2/dodfun/sdk/svn_version.h diff --git a/dlls/dod2/dodfun/svn_version.tpl b/dlls/dod2/dodfun/sdk/svn_version.tpl similarity index 100% rename from dlls/dod2/dodfun/svn_version.tpl rename to dlls/dod2/dodfun/sdk/svn_version.tpl diff --git a/dlls/dod2/dodx/Makefile b/dlls/dod2/dodx/Makefile index b9022491..6a4909e4 100755 --- a/dlls/dod2/dodx/Makefile +++ b/dlls/dod2/dodx/Makefile @@ -13,12 +13,12 @@ NAME = dodx BIN_SUFFIX = amxx_i386.so -OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp +OBJECTS = sdk/amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -47,6 +47,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) dodx dodx: $(OBJ_LINUX) @@ -58,7 +59,9 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX) diff --git a/dlls/dod2/dodx/compile.bat b/dlls/dod2/dodx/compile.bat deleted file mode 100755 index 80424108..00000000 --- a/dlls/dod2/dodx/compile.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -PATH=C:\gcc\bin;%PATH% - -make - -pause diff --git a/dlls/dod2/dodx/msvc/dodx.dsp b/dlls/dod2/dodx/msvc/dodx.dsp deleted file mode 100755 index f4c85605..00000000 --- a/dlls/dod2/dodx/msvc/dodx.dsp +++ /dev/null @@ -1,157 +0,0 @@ -# Microsoft Developer Studio Project File - Name="dodx" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=dodx - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "dodx.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "dodx.mak" CFG="dodx - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "dodx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "dodx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "dodx - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "release" -# PROP Intermediate_Dir "release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "dodx_EXPORTS" /YX /FD /c -# ADD CPP /nologo /Zp4 /MT /W3 /GX /O2 /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "dodx_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/dodx_amxx.dll" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "dodx - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "debug" -# PROP Intermediate_Dir "debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "dodx_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\amx" /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "dodx_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"debug/dodx_amxx.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "dodx - Win32 Release" -# Name "dodx - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=..\CMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\CRank.cpp -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.cpp -# End Source File -# Begin Source File - -SOURCE=..\NBase.cpp -# End Source File -# Begin Source File - -SOURCE=..\NRank.cpp -# End Source File -# Begin Source File - -SOURCE=..\usermsg.cpp -# End Source File -# Begin Source File - -SOURCE=..\Utils.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=..\CMisc.h -# End Source File -# Begin Source File - -SOURCE=..\CRank.h -# End Source File -# Begin Source File - -SOURCE=..\dodx.h -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/dlls/dod2/dodx/msvc/dodx.dsw b/dlls/dod2/dodx/msvc/dodx.dsw deleted file mode 100755 index 6b30d54d..00000000 --- a/dlls/dod2/dodx/msvc/dodx.dsw +++ /dev/null @@ -1,30 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "dodx"=.\dodx.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - - diff --git a/dlls/dod2/dodx/msvc/dodx.vcproj b/dlls/dod2/dodx/msvc/dodx.vcproj deleted file mode 100755 index 94873874..00000000 --- a/dlls/dod2/dodx/msvc/dodx.vcproj +++ /dev/null @@ -1,354 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/dod2/dodx/msvc/dodx.sln b/dlls/dod2/dodx/msvc7/dodx.sln similarity index 100% rename from dlls/dod2/dodx/msvc/dodx.sln rename to dlls/dod2/dodx/msvc7/dodx.sln diff --git a/dlls/dod2/dodx/msvc7/dodx.vcproj b/dlls/dod2/dodx/msvc7/dodx.vcproj new file mode 100755 index 00000000..6b8abb31 --- /dev/null +++ b/dlls/dod2/dodx/msvc7/dodx.vcproj @@ -0,0 +1,222 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/dod2/dodx/msvc8/dodx.vcproj b/dlls/dod2/dodx/msvc8/dodx.vcproj index 6ec0ef79..94a77dc1 100644 --- a/dlls/dod2/dodx/msvc8/dodx.vcproj +++ b/dlls/dod2/dodx/msvc8/dodx.vcproj @@ -16,8 +16,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -451,15 +259,46 @@ RelativePath="..\dodx.h" > - - + + + + + + + + + + + + + + + + + + diff --git a/dlls/dod2/dodx/amxxmodule.cpp b/dlls/dod2/dodx/sdk/amxxmodule.cpp similarity index 100% rename from dlls/dod2/dodx/amxxmodule.cpp rename to dlls/dod2/dodx/sdk/amxxmodule.cpp diff --git a/dlls/dod2/dodx/amxxmodule.h b/dlls/dod2/dodx/sdk/amxxmodule.h similarity index 100% rename from dlls/dod2/dodx/amxxmodule.h rename to dlls/dod2/dodx/sdk/amxxmodule.h diff --git a/dlls/dod2/dodx/moduleconfig.h b/dlls/dod2/dodx/sdk/moduleconfig.h similarity index 100% rename from dlls/dod2/dodx/moduleconfig.h rename to dlls/dod2/dodx/sdk/moduleconfig.h diff --git a/dlls/dod2/dodx/svn_version.h b/dlls/dod2/dodx/sdk/svn_version.h similarity index 100% rename from dlls/dod2/dodx/svn_version.h rename to dlls/dod2/dodx/sdk/svn_version.h diff --git a/dlls/dod2/dodx/svn_version.tpl b/dlls/dod2/dodx/sdk/svn_version.tpl similarity index 100% rename from dlls/dod2/dodx/svn_version.tpl rename to dlls/dod2/dodx/sdk/svn_version.tpl diff --git a/dlls/engine/Makefile b/dlls/engine/Makefile index 51f60c55..1c6fd681 100755 --- a/dlls/engine/Makefile +++ b/dlls/engine/Makefile @@ -14,13 +14,13 @@ NAME = engine BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX_64 = amxx_amd64.so -OBJECTS = amxxmodule.cpp amxxapi.cpp engine.cpp entity.cpp globals.cpp forwards.cpp \ +OBJECTS = sdk/amxxmodule.cpp amxxapi.cpp engine.cpp entity.cpp globals.cpp forwards.cpp \ amxmod_compat.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -54,6 +54,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) engine amd64: @@ -68,9 +69,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/engine/engine.dsp b/dlls/engine/engine.dsp deleted file mode 100755 index ce1ff572..00000000 --- a/dlls/engine/engine.dsp +++ /dev/null @@ -1,157 +0,0 @@ -# Microsoft Developer Studio Project File - Name="engine" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=engine - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "engine.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "engine.mak" CFG="engine - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "engine_amx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "engine - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "engine_amx - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ENGINE_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ENGINE_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/engine_amx.dll" - -!ELSEIF "$(CFG)" == "engine - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ENGINE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ENGINE_EXPORTS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "engine_amx - Win32 Release" -# Name "engine - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\amxxapi.cpp -# End Source File -# Begin Source File - -SOURCE=.\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=.\engine.cpp -# End Source File -# Begin Source File - -SOURCE=.\entity.cpp -# End Source File -# Begin Source File - -SOURCE=.\forwards.cpp -# End Source File -# Begin Source File - -SOURCE=.\globals.cpp -# End Source File -# Begin Source File - -SOURCE=.\messages.cpp -# End Source File -# Begin Source File - -SOURCE=.\meta_api.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=.\engine.h -# End Source File -# Begin Source File - -SOURCE=.\entity.h -# End Source File -# Begin Source File - -SOURCE=.\gpglobals.h -# End Source File -# Begin Source File - -SOURCE=.\messages.h -# End Source File -# Begin Source File - -SOURCE=.\moduleconfig.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/dlls/engine/engine.dsw b/dlls/engine/engine.dsw deleted file mode 100755 index 9fb1f1e7..00000000 --- a/dlls/engine/engine.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "engine_amx"=".\engine.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/dlls/engine/engine.sln b/dlls/engine/msvc7/engine.sln similarity index 100% rename from dlls/engine/engine.sln rename to dlls/engine/msvc7/engine.sln diff --git a/dlls/engine/engine.vcproj b/dlls/engine/msvc7/engine.vcproj similarity index 74% rename from dlls/engine/engine.vcproj rename to dlls/engine/msvc7/engine.vcproj index 0e906593..e322f32f 100755 --- a/dlls/engine/engine.vcproj +++ b/dlls/engine/msvc7/engine.vcproj @@ -19,7 +19,7 @@ + DebugInformationFormat="3"/> + RelativePath="..\amxmod_compat.cpp"> + RelativePath="..\amxxapi.cpp"> + RelativePath="..\engine.cpp"> + RelativePath="..\entity.cpp"> + RelativePath="..\forwards.cpp"> + RelativePath="..\globals.cpp"> + RelativePath="..\amxmod_compat.h"> + RelativePath="..\engine.h"> + RelativePath="..\entity.h"> - - - - + RelativePath="..\gpglobals.h"> - - + RelativePath="..\sdk\moduleconfig.h"> + RelativePath="..\sdk\svn_version.h"> + + + + + + + + + + + + + + + + + RelativePath="..\..\..\plugins\include\engine_const.inc"> + + + + diff --git a/dlls/engine/msvc8/engine.vcproj b/dlls/engine/msvc8/engine.vcproj index 8518940e..9e464f95 100644 --- a/dlls/engine/msvc8/engine.vcproj +++ b/dlls/engine/msvc8/engine.vcproj @@ -41,7 +41,7 @@ - - - - @@ -241,18 +234,58 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/engine/CString.h b/dlls/engine/sdk/CString.h similarity index 100% rename from dlls/engine/CString.h rename to dlls/engine/sdk/CString.h diff --git a/dlls/engine/CVector.h b/dlls/engine/sdk/CVector.h similarity index 100% rename from dlls/engine/CVector.h rename to dlls/engine/sdk/CVector.h diff --git a/dlls/engine/amxxmodule.cpp b/dlls/engine/sdk/amxxmodule.cpp similarity index 100% rename from dlls/engine/amxxmodule.cpp rename to dlls/engine/sdk/amxxmodule.cpp diff --git a/dlls/engine/amxxmodule.h b/dlls/engine/sdk/amxxmodule.h similarity index 100% rename from dlls/engine/amxxmodule.h rename to dlls/engine/sdk/amxxmodule.h diff --git a/dlls/engine/moduleconfig.h b/dlls/engine/sdk/moduleconfig.h similarity index 100% rename from dlls/engine/moduleconfig.h rename to dlls/engine/sdk/moduleconfig.h diff --git a/dlls/engine/svn_version.h b/dlls/engine/sdk/svn_version.h similarity index 100% rename from dlls/engine/svn_version.h rename to dlls/engine/sdk/svn_version.h diff --git a/dlls/engine/svn_version.tpl b/dlls/engine/sdk/svn_version.tpl similarity index 100% rename from dlls/engine/svn_version.tpl rename to dlls/engine/sdk/svn_version.tpl diff --git a/dlls/fakemeta/Makefile b/dlls/fakemeta/Makefile index 3db6c3c8..548c5f20 100755 --- a/dlls/fakemeta/Makefile +++ b/dlls/fakemeta/Makefile @@ -20,7 +20,7 @@ OBJECTS = sdk/amxxmodule.cpp dllfunc.cpp engfunc.cpp fakemeta_amxx.cpp pdata.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common -I$(HLSDK)/pm_shared + -I$(MM_ROOT) -I$(HLSDK)/common -I$(HLSDK)/pm_shared -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) diff --git a/dlls/fakemeta/fakemeta.sln b/dlls/fakemeta/msvc7/fakemeta.sln similarity index 100% rename from dlls/fakemeta/fakemeta.sln rename to dlls/fakemeta/msvc7/fakemeta.sln diff --git a/dlls/fakemeta/fakemeta.vcproj b/dlls/fakemeta/msvc7/fakemeta.vcproj similarity index 74% rename from dlls/fakemeta/fakemeta.vcproj rename to dlls/fakemeta/msvc7/fakemeta.vcproj index 681b2a6f..04ebb2de 100755 --- a/dlls/fakemeta/fakemeta.vcproj +++ b/dlls/fakemeta/msvc7/fakemeta.vcproj @@ -20,6 +20,7 @@ + DebugInformationFormat="3"/> + RelativePath="..\fakemeta_amxx.cpp"> + RelativePath="..\fakemeta_amxx.h"> + RelativePath="..\fm_tr.cpp"> + RelativePath="..\fm_tr.h"> + RelativePath="..\fm_tr2.cpp"> + RelativePath="..\misc.cpp"> + RelativePath="..\pdata.cpp"> - - - - - - - - - - + RelativePath="..\dllfunc.cpp"> + RelativePath="..\dllfunc.h"> + RelativePath="..\engfunc.cpp"> + RelativePath="..\engfunc.h"> + RelativePath="..\pev.cpp"> @@ -188,36 +174,69 @@ Name="Forwards" Filter=""> + RelativePath="..\forward.cpp"> + RelativePath="..\forward.h"> - - - - - - - - + RelativePath="..\forwardmacros.h"> + RelativePath="..\glb.cpp"> + RelativePath="..\glb.h"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/fakemeta/msvc8/fakemeta.vcproj b/dlls/fakemeta/msvc8/fakemeta.vcproj index c4aa891f..bc5b3fdd 100644 --- a/dlls/fakemeta/msvc8/fakemeta.vcproj +++ b/dlls/fakemeta/msvc8/fakemeta.vcproj @@ -41,6 +41,7 @@ - - @@ -214,22 +212,6 @@ RelativePath="..\pdata.cpp" > - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -301,16 +331,8 @@ RelativePath="..\..\..\plugins\include\fakemeta_stocks.inc" > - - - - diff --git a/dlls/fakemeta/CString.h b/dlls/fakemeta/sdk/CString.h similarity index 100% rename from dlls/fakemeta/CString.h rename to dlls/fakemeta/sdk/CString.h diff --git a/dlls/fakemeta/CVector.h b/dlls/fakemeta/sdk/CVector.h similarity index 100% rename from dlls/fakemeta/CVector.h rename to dlls/fakemeta/sdk/CVector.h diff --git a/dlls/fakemeta/sdk/amxxmodule.cpp b/dlls/fakemeta/sdk/amxxmodule.cpp index 30ef9c79..d8c8c56c 100755 --- a/dlls/fakemeta/sdk/amxxmodule.cpp +++ b/dlls/fakemeta/sdk/amxxmodule.cpp @@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindLibrary(NULL, LibType_Class); MF_AddLibraries(NULL, LibType_Class, NULL); MF_RemoveLibraries(NULL); - MF_OverrideNatives(NULL); + MF_OverrideNatives(NULL, ""); } #endif diff --git a/dlls/fun/Makefile b/dlls/fun/Makefile index 1c788f78..532f306c 100755 --- a/dlls/fun/Makefile +++ b/dlls/fun/Makefile @@ -14,12 +14,12 @@ NAME = fun BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX_64 = amxx_amd64.so -OBJECTS = amxxmodule.cpp fun.cpp +OBJECTS = sdk/amxxmodule.cpp fun.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -53,6 +53,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) fun amd64: @@ -67,9 +68,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/fun/fun.dsp b/dlls/fun/fun.dsp deleted file mode 100755 index c185317b..00000000 --- a/dlls/fun/fun.dsp +++ /dev/null @@ -1,135 +0,0 @@ -# Microsoft Developer Studio Project File - Name="fun_amx" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=fun_amx - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "fun.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "fun.mak" CFG="fun_amx - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "fun_amx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "fun_amx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "fun_amx - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FUN_EXPORTS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FUN_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x41d /d "NDEBUG" -# ADD RSC /l 0x41d /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"Release/fun_amxx.dll" -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=echo Copying dll... copy Release\fun.dll K:\S\cstrike\addons\amxx\modules\fun_amx.dll echo Copying inc... copy ..\plugins\include\fun.inc K:\S\cstrike\addons\amxx\scripting\include -# End Special Build Tool - -!ELSEIF "$(CFG)" == "fun_amx - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FUN_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FUN_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x41d /d "_DEBUG" -# ADD RSC /l 0x41d /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/fun_amxx_debug.dll" /pdbtype:sept -# Begin Special Build Tool -SOURCE="$(InputPath)" -PostBuild_Cmds=copy debug\fun_debug.dll K:S\cstrike\addons\amxx\modules\fun_amx.dll copy ..\plugins\include\fun.inc K:\S\cstrike\addons\amxx\scripting\include\fun.inc -# End Special Build Tool - -!ENDIF - -# Begin Target - -# Name "fun_amx - Win32 Release" -# Name "fun_amx - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=.\fun.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=.\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=.\fun.h -# End Source File -# Begin Source File - -SOURCE=.\moduleconfig.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# Begin Source File - -SOURCE=..\plugins\include\fun.inc -# End Source File -# End Target -# End Project diff --git a/dlls/fun/fun.dsw b/dlls/fun/fun.dsw deleted file mode 100755 index b377c4db..00000000 --- a/dlls/fun/fun.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "fun_amx"=".\fun.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/dlls/fun/fun.sln b/dlls/fun/msvc7/fun.sln similarity index 100% rename from dlls/fun/fun.sln rename to dlls/fun/msvc7/fun.sln diff --git a/dlls/fun/fun.vcproj b/dlls/fun/msvc7/fun.vcproj similarity index 81% rename from dlls/fun/fun.vcproj rename to dlls/fun/msvc7/fun.vcproj index e954ce3b..2411e4ca 100755 --- a/dlls/fun/fun.vcproj +++ b/dlls/fun/msvc7/fun.vcproj @@ -2,7 +2,7 @@ @@ -23,6 +23,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" + AdditionalIncludeDirectories="../sdk" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS" StringPooling="TRUE" RuntimeLibrary="4" @@ -86,6 +87,7 @@ + DebugInformationFormat="3"/> - - - - - - + RelativePath="..\fun.cpp"> + RelativePath="..\fun.h"> - - - - + RelativePath="..\sdk\moduleconfig.h"> + RelativePath="..\sdk\svn_version.h"> + + + + + + + + + RelativePath="..\..\..\plugins\include\fun.inc"> diff --git a/dlls/fun/msvc8/fun.vcproj b/dlls/fun/msvc8/fun.vcproj index fbf579f9..142e609c 100644 --- a/dlls/fun/msvc8/fun.vcproj +++ b/dlls/fun/msvc8/fun.vcproj @@ -4,7 +4,7 @@ Version="8.00" Name="fun" ProjectGUID="{43B95C78-8D1A-4D12-B668-2520B38E1DA3}" - RootNamespace="fun" + RootNamespace="fun_amx" > - - - - - - + + + + + + + + + + + + - - - - - - - - diff --git a/dlls/fun/amxxmodule.cpp b/dlls/fun/sdk/amxxmodule.cpp similarity index 100% rename from dlls/fun/amxxmodule.cpp rename to dlls/fun/sdk/amxxmodule.cpp diff --git a/dlls/fun/amxxmodule.h b/dlls/fun/sdk/amxxmodule.h similarity index 100% rename from dlls/fun/amxxmodule.h rename to dlls/fun/sdk/amxxmodule.h diff --git a/dlls/fun/moduleconfig.h b/dlls/fun/sdk/moduleconfig.h similarity index 100% rename from dlls/fun/moduleconfig.h rename to dlls/fun/sdk/moduleconfig.h diff --git a/dlls/fun/svn_version.h b/dlls/fun/sdk/svn_version.h similarity index 100% rename from dlls/fun/svn_version.h rename to dlls/fun/sdk/svn_version.h diff --git a/dlls/fun/svn_version.tpl b/dlls/fun/sdk/svn_version.tpl similarity index 100% rename from dlls/fun/svn_version.tpl rename to dlls/fun/sdk/svn_version.tpl diff --git a/dlls/geoip/Makefile b/dlls/geoip/Makefile index 6948469d..1c1700e7 100755 --- a/dlls/geoip/Makefile +++ b/dlls/geoip/Makefile @@ -14,12 +14,12 @@ NAME = geoip BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX_64 = amxx_amd64.so -OBJECTS = GeoIP.c amxxmodule.cpp geoip_amxx.cpp +OBJECTS = sdk/amxxmodule.cpp GeoIP.c geoip_amxx.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -60,6 +60,7 @@ $(BIN_DIR)/%.o: %.c all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) geoip amd64: @@ -74,9 +75,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/geoip/geoip.sln b/dlls/geoip/msvc7/geoip.sln similarity index 100% rename from dlls/geoip/geoip.sln rename to dlls/geoip/msvc7/geoip.sln diff --git a/dlls/geoip/geoip.vcproj b/dlls/geoip/msvc7/geoip.vcproj similarity index 81% rename from dlls/geoip/geoip.vcproj rename to dlls/geoip/msvc7/geoip.vcproj index d98f08c0..704d6203 100755 --- a/dlls/geoip/geoip.vcproj +++ b/dlls/geoip/msvc7/geoip.vcproj @@ -19,6 +19,7 @@ + DebugInformationFormat="3"/> + RelativePath="..\geoip_amxx.cpp"> - - - - - - - - - - - - - - + RelativePath="..\geoip_amxx.h"> + Name="GeoIP" + Filter=""> + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/geoip/msvc8/geoip.vcproj b/dlls/geoip/msvc8/geoip.vcproj index 14fed890..ff3eaa28 100644 --- a/dlls/geoip/msvc8/geoip.vcproj +++ b/dlls/geoip/msvc8/geoip.vcproj @@ -41,6 +41,7 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/geoip/amxxmodule.cpp b/dlls/geoip/sdk/amxxmodule.cpp similarity index 100% rename from dlls/geoip/amxxmodule.cpp rename to dlls/geoip/sdk/amxxmodule.cpp diff --git a/dlls/geoip/amxxmodule.h b/dlls/geoip/sdk/amxxmodule.h similarity index 100% rename from dlls/geoip/amxxmodule.h rename to dlls/geoip/sdk/amxxmodule.h diff --git a/dlls/geoip/moduleconfig.h b/dlls/geoip/sdk/moduleconfig.h similarity index 100% rename from dlls/geoip/moduleconfig.h rename to dlls/geoip/sdk/moduleconfig.h diff --git a/dlls/geoip/svn_version.h b/dlls/geoip/sdk/svn_version.h similarity index 100% rename from dlls/geoip/svn_version.h rename to dlls/geoip/sdk/svn_version.h diff --git a/dlls/geoip/svn_version.tpl b/dlls/geoip/sdk/svn_version.tpl similarity index 100% rename from dlls/geoip/svn_version.tpl rename to dlls/geoip/sdk/svn_version.tpl diff --git a/dlls/mysqlx/mysql2.sln b/dlls/mysqlx/msvc7/mysqlx.sln similarity index 86% rename from dlls/mysqlx/mysql2.sln rename to dlls/mysqlx/msvc7/mysqlx.sln index b9853023..192949fb 100644 --- a/dlls/mysqlx/mysql2.sln +++ b/dlls/mysqlx/msvc7/mysqlx.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql2", "mysql2.vcproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlx", "mysqlx.vcproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject diff --git a/dlls/mysqlx/mysql2.vcproj b/dlls/mysqlx/msvc7/mysqlx.vcproj similarity index 69% rename from dlls/mysqlx/mysql2.vcproj rename to dlls/mysqlx/msvc7/mysqlx.vcproj index 282f694c..b367bfd6 100644 --- a/dlls/mysqlx/mysql2.vcproj +++ b/dlls/mysqlx/msvc7/mysqlx.vcproj @@ -2,7 +2,7 @@ @@ -19,7 +19,7 @@ + DebugInformationFormat="3"/> + RelativePath="..\basic_sql.cpp"> + RelativePath="..\handles.cpp"> + RelativePath="..\module.cpp"> + RelativePath="..\oldcompat_sql.cpp"> + RelativePath="..\threading.cpp"> + RelativePath="..\mysql2_header.h"> + RelativePath="..\sqlheaders.h"> + + - - + RelativePath="..\thread\IThreader.h"> + RelativePath="..\thread\BaseWorker.cpp"> + RelativePath="..\thread\ThreadWorker.cpp"> + RelativePath="..\thread\WinThreads.cpp"> + RelativePath="..\thread\BaseWorker.h"> + RelativePath="..\thread\ThreadSupport.h"> + RelativePath="..\thread\ThreadWorker.h"> + RelativePath="..\thread\WinThreads.h"> @@ -192,67 +190,79 @@ Name="Database" Filter=""> + RelativePath="..\mysql\ISQLDriver.h"> + RelativePath="..\mysql\MysqlDatabase.h"> + RelativePath="..\mysql\MysqlDriver.h"> + RelativePath="..\mysql\MysqlHeaders.h"> + RelativePath="..\mysql\MysqlQuery.h"> + RelativePath="..\mysql\MysqlResultSet.h"> + RelativePath="..\mysql\MysqlDatabase.cpp"> + RelativePath="..\mysql\MysqlDriver.cpp"> + RelativePath="..\mysql\MysqlQuery.cpp"> + RelativePath="..\mysql\MysqlResultSet.cpp"> + RelativePath="..\sdk\moduleconfig.h"> + + + + + + + + + + + + + + + + - - - - - - - - - - + RelativePath="..\..\..\plugins\include\sqlx.inc"> diff --git a/dlls/mysqlx/msvc8/mysql2.sln b/dlls/mysqlx/msvc8/mysqlx.sln similarity index 84% rename from dlls/mysqlx/msvc8/mysql2.sln rename to dlls/mysqlx/msvc8/mysqlx.sln index 22b1ed89..4b972f1d 100644 --- a/dlls/mysqlx/msvc8/mysql2.sln +++ b/dlls/mysqlx/msvc8/mysqlx.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql2", "mysql2.vcproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlx", "mysqlx.vcproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/dlls/mysqlx/msvc8/mysql2.vcproj b/dlls/mysqlx/msvc8/mysqlx.vcproj similarity index 89% rename from dlls/mysqlx/msvc8/mysql2.vcproj rename to dlls/mysqlx/msvc8/mysqlx.vcproj index 50888774..a1c1cd1a 100644 --- a/dlls/mysqlx/msvc8/mysql2.vcproj +++ b/dlls/mysqlx/msvc8/mysqlx.vcproj @@ -2,9 +2,9 @@ @@ -41,7 +41,7 @@ + + - - @@ -326,34 +324,46 @@ - - - - - - - - - + + + + + + + - + + + + + + + diff --git a/dlls/ns/ns/CPlayer.cpp b/dlls/ns/CPlayer.cpp similarity index 100% rename from dlls/ns/ns/CPlayer.cpp rename to dlls/ns/CPlayer.cpp diff --git a/dlls/ns/ns/CPlayer.h b/dlls/ns/CPlayer.h similarity index 100% rename from dlls/ns/ns/CPlayer.h rename to dlls/ns/CPlayer.h diff --git a/dlls/ns/ns/CSpawn.cpp b/dlls/ns/CSpawn.cpp similarity index 100% rename from dlls/ns/ns/CSpawn.cpp rename to dlls/ns/CSpawn.cpp diff --git a/dlls/ns/ns/CSpawn.h b/dlls/ns/CSpawn.h similarity index 100% rename from dlls/ns/ns/CSpawn.h rename to dlls/ns/CSpawn.h diff --git a/dlls/ns/ns/Makefile b/dlls/ns/Makefile similarity index 84% rename from dlls/ns/ns/Makefile rename to dlls/ns/Makefile index f6a35337..3269f04f 100755 --- a/dlls/ns/ns/Makefile +++ b/dlls/ns/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 ### @@ -13,12 +13,12 @@ NAME = ns BIN_SUFFIX = amxx_i386.so -OBJECTS = amxxmodule.cpp CPlayer.cpp CSpawn.cpp NMisc.cpp NPData.cpp hookedfunctions.cpp +OBJECTS = sdk/amxxmodule.cpp CPlayer.cpp CSpawn.cpp NMisc.cpp NPData.cpp hookedfunctions.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common -I$(HLSDK)/pm_shared + -I$(MM_ROOT) -I$(HLSDK)/common -I$(HLSDK)/pm_shared -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -59,8 +59,10 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX) diff --git a/dlls/ns/ns/NMisc.cpp b/dlls/ns/NMisc.cpp similarity index 100% rename from dlls/ns/ns/NMisc.cpp rename to dlls/ns/NMisc.cpp diff --git a/dlls/ns/ns/NPData.cpp b/dlls/ns/NPData.cpp similarity index 100% rename from dlls/ns/ns/NPData.cpp rename to dlls/ns/NPData.cpp diff --git a/dlls/ns/ns/amxxapi.h b/dlls/ns/amxxapi.h similarity index 100% rename from dlls/ns/ns/amxxapi.h rename to dlls/ns/amxxapi.h diff --git a/dlls/ns/ns/hookedfunctions.cpp b/dlls/ns/hookedfunctions.cpp similarity index 100% rename from dlls/ns/ns/hookedfunctions.cpp rename to dlls/ns/hookedfunctions.cpp diff --git a/dlls/ns/ns/ns.sln b/dlls/ns/msvc7/ns.sln similarity index 100% rename from dlls/ns/ns/ns.sln rename to dlls/ns/msvc7/ns.sln diff --git a/dlls/ns/ns/ns.vcproj b/dlls/ns/msvc7/ns.vcproj similarity index 67% rename from dlls/ns/ns/ns.vcproj rename to dlls/ns/msvc7/ns.vcproj index 6da7b07b..94c009e6 100755 --- a/dlls/ns/ns/ns.vcproj +++ b/dlls/ns/msvc7/ns.vcproj @@ -22,7 +22,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""c:\Documents and Settings\Steve\My Documents\include\metamod";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\common";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\engine";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\dlls";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\pm_shared"" + AdditionalIncludeDirectories="..\sdk" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS" StringPooling="TRUE" RuntimeLibrary="4" @@ -86,7 +86,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/I " Optimization="0" - AdditionalIncludeDirectories=""c:\Documents and Settings\Steve\My Documents\include\metamod";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\common";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\engine";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\dlls";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\pm_shared"" + AdditionalIncludeDirectories="..\sdk" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS" BasicRuntimeChecks="3" RuntimeLibrary="5" @@ -97,7 +97,7 @@ ProgramDataBaseFileName=".\Debug/" WarningLevel="3" SuppressStartupBanner="TRUE" - DebugInformationFormat="4" + DebugInformationFormat="3" CompileAs="0"/> @@ -147,80 +147,74 @@ Name="Source Files" Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"> + RelativePath="..\CPlayer.cpp"> + RelativePath="..\CSpawn.cpp"> + RelativePath="..\hookedfunctions.cpp"> - - - - - - + RelativePath="..\NMisc.cpp"> - - + RelativePath="..\NPData.cpp"> + RelativePath="..\CPlayer.h"> + RelativePath="..\CSpawn.h"> + RelativePath="..\ns.h"> + RelativePath="..\ns_const.h"> + RelativePath="..\plugin.h"> - - - - + RelativePath="..\utilfunctions.h"> + + + + + + + + + + + + + RelativePath="..\..\..\plugins\include\ns.inc"> + RelativePath="..\..\..\plugins\include\ns2amx.inc"> + RelativePath="..\..\..\plugins\include\ns_const.inc"> diff --git a/dlls/ns/ns/msvc8/ns.sln b/dlls/ns/msvc8/ns.sln similarity index 100% rename from dlls/ns/ns/msvc8/ns.sln rename to dlls/ns/msvc8/ns.sln diff --git a/dlls/ns/ns/msvc8/ns.vcproj b/dlls/ns/msvc8/ns.vcproj similarity index 78% rename from dlls/ns/ns/msvc8/ns.vcproj rename to dlls/ns/msvc8/ns.vcproj index 716567b4..57dd5f25 100644 --- a/dlls/ns/ns/msvc8/ns.vcproj +++ b/dlls/ns/msvc8/ns.vcproj @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories=""c:\Documents and Settings\Steve\My Documents\include\metamod";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\common";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\engine";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\dlls";"c:\Documents and Settings\Steve\My Documents\include\HLSDKMP\pm_shared"" + AdditionalIncludeDirectories="..\sdk" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS" StringPooling="true" RuntimeLibrary="0" @@ -142,8 +142,9 @@ /> - - @@ -227,27 +224,6 @@ - - - - - - - - @@ -274,10 +246,6 @@ RelativePath="..\CSpawn.h" > - - @@ -296,7 +264,31 @@ + + + + + + + + + + + + &1 | cut -b1) @@ -68,10 +68,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) - diff --git a/dlls/nvault/nvault.sln b/dlls/nvault/msvc7/nvault.sln similarity index 100% rename from dlls/nvault/nvault.sln rename to dlls/nvault/msvc7/nvault.sln diff --git a/dlls/nvault/nvault.vcproj b/dlls/nvault/msvc7/nvault.vcproj similarity index 74% rename from dlls/nvault/nvault.vcproj rename to dlls/nvault/msvc7/nvault.vcproj index 8979f2e0..5162eecc 100755 --- a/dlls/nvault/nvault.vcproj +++ b/dlls/nvault/msvc7/nvault.vcproj @@ -19,6 +19,7 @@ + DebugInformationFormat="3"/> - - - + RelativePath="..\amxxapi.cpp"> + RelativePath="..\Binary.cpp"> + RelativePath="..\Journal.cpp"> + RelativePath="..\NVault.cpp"> + RelativePath="..\amxxapi.h"> + RelativePath="..\Binary.h"> + RelativePath="..\compat.h"> + RelativePath="..\IVault.h"> + RelativePath="..\Journal.h"> - - - - - - + RelativePath="..\NVault.h"> - - + RelativePath="..\sdk\moduleconfig.h"> + RelativePath="..\sdk\svn_version.h"> + + + + + + + + + + + + + + + + + + + + - - + RelativePath="..\..\..\plugins\include\nvault.inc"> diff --git a/dlls/nvault/msvc8/nvault.vcproj b/dlls/nvault/msvc8/nvault.vcproj index 117c8775..aeb463f5 100644 --- a/dlls/nvault/msvc8/nvault.vcproj +++ b/dlls/nvault/msvc8/nvault.vcproj @@ -41,6 +41,7 @@ - - - - - @@ -246,38 +233,60 @@ RelativePath="..\NVault.h" > - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/dlls/nvault/nvault.inc b/dlls/nvault/nvault.inc deleted file mode 100755 index bb2760d8..00000000 --- a/dlls/nvault/nvault.inc +++ /dev/null @@ -1,48 +0,0 @@ -/* nVault - * - * A binary (hash table) vault with journaling. - * (C)2005 David "BAILOPAN" Anderson - */ - -#if defined _nvault_included - #endinput -#endif -#define _nvault_included - -/* Opens a vault and returns an id to it - * The vault name is appended with ".nvt" and stored in - * datadir/vault. - */ -native vault_open(const name[]); - -/* Reads from a vault. - * No extra params - gets as an int - * One extra param - Float byref - * Two extra params - gets as a string - */ -native nvault_get(id, const key[], ...); - -/* Reads from a vault, includes time - * Parameter format same as nvault_get() - */ -native nvault_timeget(id, const key[], &time, ...); - -/* Sets a key/value pair - * valFmt is formatted according to format() - */ -native nvault_set(id, const key[], const valFmt[], {Float,_}:...); - -/* Sets a permanent key/value pair - * A permanent key isn't timestamped, so it can be invulnerable to pruning. - */ -native nvault_pset(id, const key[], const valFmt[], {Float,_}:...); - - -/* Sets a data under given key. */ -native set_vaultdata(const key[], const data[] = "" ); - -/* Removes a key from vault.*/ -native remove_vaultdata(const key[]); - -/* Checks if a key exists in the vault.*/ -native vaultdata_exists(const key[]); \ No newline at end of file diff --git a/dlls/nvault/CQueue.h b/dlls/nvault/sdk/CQueue.h similarity index 100% rename from dlls/nvault/CQueue.h rename to dlls/nvault/sdk/CQueue.h diff --git a/dlls/nvault/CString.h b/dlls/nvault/sdk/CString.h similarity index 100% rename from dlls/nvault/CString.h rename to dlls/nvault/sdk/CString.h diff --git a/dlls/nvault/CVector.h b/dlls/nvault/sdk/CVector.h similarity index 100% rename from dlls/nvault/CVector.h rename to dlls/nvault/sdk/CVector.h diff --git a/dlls/ns/ns/amxxmodule.cpp b/dlls/nvault/sdk/amxxmodule.cpp similarity index 99% rename from dlls/ns/ns/amxxmodule.cpp rename to dlls/nvault/sdk/amxxmodule.cpp index 30ef9c79..d8c8c56c 100755 --- a/dlls/ns/ns/amxxmodule.cpp +++ b/dlls/nvault/sdk/amxxmodule.cpp @@ -2773,7 +2773,7 @@ void ValidateMacros_DontCallThis_Smiley() MF_FindLibrary(NULL, LibType_Class); MF_AddLibraries(NULL, LibType_Class, NULL); MF_RemoveLibraries(NULL); - MF_OverrideNatives(NULL); + MF_OverrideNatives(NULL, ""); } #endif diff --git a/dlls/nvault/amxxmodule.h b/dlls/nvault/sdk/amxxmodule.h similarity index 100% rename from dlls/nvault/amxxmodule.h rename to dlls/nvault/sdk/amxxmodule.h diff --git a/dlls/nvault/moduleconfig.h b/dlls/nvault/sdk/moduleconfig.h similarity index 100% rename from dlls/nvault/moduleconfig.h rename to dlls/nvault/sdk/moduleconfig.h diff --git a/dlls/nvault/sh_list.h b/dlls/nvault/sdk/sh_list.h similarity index 100% rename from dlls/nvault/sh_list.h rename to dlls/nvault/sdk/sh_list.h diff --git a/dlls/nvault/sh_tinyhash.h b/dlls/nvault/sdk/sh_tinyhash.h similarity index 100% rename from dlls/nvault/sh_tinyhash.h rename to dlls/nvault/sdk/sh_tinyhash.h diff --git a/dlls/nvault/svn_version.h b/dlls/nvault/sdk/svn_version.h similarity index 100% rename from dlls/nvault/svn_version.h rename to dlls/nvault/sdk/svn_version.h diff --git a/dlls/nvault/svn_version.tpl b/dlls/nvault/sdk/svn_version.tpl similarity index 100% rename from dlls/nvault/svn_version.tpl rename to dlls/nvault/sdk/svn_version.tpl diff --git a/dlls/regex/Makefile b/dlls/regex/Makefile index 17f8bea4..9618844a 100755 --- a/dlls/regex/Makefile +++ b/dlls/regex/Makefile @@ -14,12 +14,12 @@ NAME = regex BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX_64 = amxx_amd64.so -OBJECTS = amxxmodule.cpp module.cpp CRegEx.cpp +OBJECTS = sdk/amxxmodule.cpp module.cpp CRegEx.cpp LINK = -lpcre INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -70,10 +70,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) - diff --git a/dlls/regex/regex.sln b/dlls/regex/msvc7/regex.sln similarity index 100% rename from dlls/regex/regex.sln rename to dlls/regex/msvc7/regex.sln diff --git a/dlls/regex/regex.vcproj b/dlls/regex/msvc7/regex.vcproj similarity index 80% rename from dlls/regex/regex.vcproj rename to dlls/regex/msvc7/regex.vcproj index 3fc17f5c..77ee79ff 100755 --- a/dlls/regex/regex.vcproj +++ b/dlls/regex/msvc7/regex.vcproj @@ -19,6 +19,7 @@ + DebugInformationFormat="3"/> + RelativePath="..\CRegEx.cpp"> + RelativePath="..\module.cpp"> + RelativePath="..\CRegEx.h"> - - - - + RelativePath="..\pcre.h"> - - + RelativePath="..\sdk\moduleconfig.h"> + RelativePath="..\sdk\svn_version.h"> + + + + + + + + + + + + + RelativePath="..\..\..\plugins\include\regex.inc"> diff --git a/dlls/regex/msvc8/regex.vcproj b/dlls/regex/msvc8/regex.vcproj index 36426f0b..d344aa24 100644 --- a/dlls/regex/msvc8/regex.vcproj +++ b/dlls/regex/msvc8/regex.vcproj @@ -41,6 +41,7 @@ - - - - + + + + + + + + + + + + + + - - - - diff --git a/dlls/regex/CVector.h b/dlls/regex/sdk/CVector.h similarity index 100% rename from dlls/regex/CVector.h rename to dlls/regex/sdk/CVector.h diff --git a/dlls/regex/amxxmodule.cpp b/dlls/regex/sdk/amxxmodule.cpp similarity index 100% rename from dlls/regex/amxxmodule.cpp rename to dlls/regex/sdk/amxxmodule.cpp diff --git a/dlls/regex/amxxmodule.h b/dlls/regex/sdk/amxxmodule.h similarity index 100% rename from dlls/regex/amxxmodule.h rename to dlls/regex/sdk/amxxmodule.h diff --git a/dlls/regex/moduleconfig.h b/dlls/regex/sdk/moduleconfig.h similarity index 100% rename from dlls/regex/moduleconfig.h rename to dlls/regex/sdk/moduleconfig.h diff --git a/dlls/regex/svn_version.h b/dlls/regex/sdk/svn_version.h similarity index 100% rename from dlls/regex/svn_version.h rename to dlls/regex/sdk/svn_version.h diff --git a/dlls/regex/svn_version.tpl b/dlls/regex/sdk/svn_version.tpl similarity index 100% rename from dlls/regex/svn_version.tpl rename to dlls/regex/sdk/svn_version.tpl diff --git a/dlls/sockets/Makefile b/dlls/sockets/Makefile index e040c52e..65e61685 100755 --- a/dlls/sockets/Makefile +++ b/dlls/sockets/Makefile @@ -14,12 +14,12 @@ NAME = sockets BIN_SUFFIX_32 = amxx_i386.so BIN_SUFFIX_64 = amxx_amd64.so -OBJECTS = amxxmodule.cpp sockets.cpp +OBJECTS = sdk/amxxmodule.cpp sockets.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -54,12 +54,12 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)/sdk - $(MAKE) geoip + $(MAKE) sockets amd64: $(MAKE) all AMD64=true -geoip: $(OBJ_LINUX) +sockets: $(OBJ_LINUX) $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: @@ -68,10 +68,11 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX_32) rm -rf Release/$(NAME)_$(BIN_SUFFIX_64) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX_32) rm -rf Debug/$(NAME)_$(BIN_SUFFIX_64) - diff --git a/dlls/sockets/sockets.sln b/dlls/sockets/msvc7/sockets.sln similarity index 100% rename from dlls/sockets/sockets.sln rename to dlls/sockets/msvc7/sockets.sln diff --git a/dlls/sockets/sockets.vcproj b/dlls/sockets/msvc7/sockets.vcproj similarity index 86% rename from dlls/sockets/sockets.vcproj rename to dlls/sockets/msvc7/sockets.vcproj index 1866f364..5a0a11de 100755 --- a/dlls/sockets/sockets.vcproj +++ b/dlls/sockets/msvc7/sockets.vcproj @@ -20,6 +20,7 @@ + RelativePath="..\sockets.cpp"> + Name="Module SDK" + Filter=""> + + + + + RelativePath="..\sdk\amxxmodule.cpp"> - - + RelativePath="..\sdk\amxxmodule.h"> + Name="Pawn Includes" + Filter=""> + + diff --git a/dlls/sockets/msvc8/sockets.vcproj b/dlls/sockets/msvc8/sockets.vcproj index cf38aaf5..d37fa0af 100644 --- a/dlls/sockets/msvc8/sockets.vcproj +++ b/dlls/sockets/msvc8/sockets.vcproj @@ -41,6 +41,7 @@ + + + + - - + + diff --git a/dlls/sockets/amxxmodule.cpp b/dlls/sockets/sdk/amxxmodule.cpp similarity index 100% rename from dlls/sockets/amxxmodule.cpp rename to dlls/sockets/sdk/amxxmodule.cpp diff --git a/dlls/sockets/amxxmodule.h b/dlls/sockets/sdk/amxxmodule.h similarity index 100% rename from dlls/sockets/amxxmodule.h rename to dlls/sockets/sdk/amxxmodule.h diff --git a/dlls/sockets/moduleconfig.h b/dlls/sockets/sdk/moduleconfig.h similarity index 100% rename from dlls/sockets/moduleconfig.h rename to dlls/sockets/sdk/moduleconfig.h diff --git a/dlls/sockets/svn_version.h b/dlls/sockets/sdk/svn_version.h similarity index 100% rename from dlls/sockets/svn_version.h rename to dlls/sockets/sdk/svn_version.h diff --git a/dlls/sockets/svn_version.tpl b/dlls/sockets/sdk/svn_version.tpl similarity index 100% rename from dlls/sockets/svn_version.tpl rename to dlls/sockets/sdk/svn_version.tpl diff --git a/dlls/sqlite/msvc7/sqlite_amxx.sln b/dlls/sqlite/msvc7/sqlite.sln similarity index 93% rename from dlls/sqlite/msvc7/sqlite_amxx.sln rename to dlls/sqlite/msvc7/sqlite.sln index 7af42838..5f13882e 100755 --- a/dlls/sqlite/msvc7/sqlite_amxx.sln +++ b/dlls/sqlite/msvc7/sqlite.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite_amxx.vcproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite.vcproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject diff --git a/dlls/sqlite/msvc7/sqlite_amxx.vcproj b/dlls/sqlite/msvc7/sqlite.vcproj similarity index 98% rename from dlls/sqlite/msvc7/sqlite_amxx.vcproj rename to dlls/sqlite/msvc7/sqlite.vcproj index 9ff2afbb..1a9bfdb6 100644 --- a/dlls/sqlite/msvc7/sqlite_amxx.vcproj +++ b/dlls/sqlite/msvc7/sqlite.vcproj @@ -149,34 +149,91 @@ + + - - + RelativePath="..\sqlitepp\ISQLDriver.h"> + RelativePath="..\sqlitepp\SqliteDatabase.h"> + + + + + + + + + RelativePath="..\sqlitepp\SqliteDatabase.cpp"> + RelativePath="..\sqlitepp\SqliteDriver.cpp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -338,85 +395,38 @@ + RelativePath="..\sdk\moduleconfig.h"> + + - - - - - - - - + RelativePath="..\sdk\sh_list.h"> + RelativePath="..\sdk\amxxmodule.cpp"> - - - - + RelativePath="..\sdk\amxxmodule.h"> - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/dlls/sqlite/msvc8/sqlite_amxx.sln b/dlls/sqlite/msvc8/sqlite.sln similarity index 83% rename from dlls/sqlite/msvc8/sqlite_amxx.sln rename to dlls/sqlite/msvc8/sqlite.sln index dbe3da10..9c6b1952 100644 --- a/dlls/sqlite/msvc8/sqlite_amxx.sln +++ b/dlls/sqlite/msvc8/sqlite.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite_amxx", "sqlite_amxx.vcproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite.vcproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/dlls/sqlite/msvc8/sqlite_amxx.vcproj b/dlls/sqlite/msvc8/sqlite.vcproj similarity index 98% rename from dlls/sqlite/msvc8/sqlite_amxx.vcproj rename to dlls/sqlite/msvc8/sqlite.vcproj index 9cac5535..683c8c81 100644 --- a/dlls/sqlite/msvc8/sqlite_amxx.vcproj +++ b/dlls/sqlite/msvc8/sqlite.vcproj @@ -2,7 +2,7 @@ + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -469,104 +541,44 @@ + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/dlls/tfc/tfcx/compile.bat b/dlls/tfc/tfcx/compile.bat deleted file mode 100755 index 80424108..00000000 --- a/dlls/tfc/tfcx/compile.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off -PATH=C:\gcc\bin;%PATH% - -make - -pause diff --git a/dlls/tfc/tfcx/msvc/tfcx.dsp b/dlls/tfc/tfcx/msvc/tfcx.dsp deleted file mode 100755 index ad186573..00000000 --- a/dlls/tfc/tfcx/msvc/tfcx.dsp +++ /dev/null @@ -1,157 +0,0 @@ -# Microsoft Developer Studio Project File - Name="tfcx" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=tfcx - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "tfcx.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "tfcx.mak" CFG="tfcx - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "tfcx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "tfcx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "tfcx - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "release" -# PROP Intermediate_Dir "release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "tfcx_EXPORTS" /YX /FD /c -# ADD CPP /nologo /Zp4 /MT /W3 /GX /O2 /I "..\..\amxmodx" /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "tfcx_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"release/tfcx_amxx.dll" -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "tfcx - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "debug" -# PROP Intermediate_Dir "debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "tfcx_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "tfcx_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"debug/tfcx_amxx.dll" /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "tfcx - Win32 Release" -# Name "tfcx - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=..\CMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\CRank.cpp -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.cpp -# End Source File -# Begin Source File - -SOURCE=..\NBase.cpp -# End Source File -# Begin Source File - -SOURCE=..\NRank.cpp -# End Source File -# Begin Source File - -SOURCE=..\usermsg.cpp -# End Source File -# Begin Source File - -SOURCE=..\Utils.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=..\CMisc.h -# End Source File -# Begin Source File - -SOURCE=..\CRank.h -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.h -# End Source File -# Begin Source File - -SOURCE=..\tfcx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/dlls/tfc/tfcx/msvc/tfcx.dsw b/dlls/tfc/tfcx/msvc/tfcx.dsw deleted file mode 100755 index 251c1674..00000000 --- a/dlls/tfc/tfcx/msvc/tfcx.dsw +++ /dev/null @@ -1,30 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "tfcx"=.\tfcx.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - - diff --git a/dlls/tfc/tfcx/CMisc.cpp b/dlls/tfcx/CMisc.cpp similarity index 100% rename from dlls/tfc/tfcx/CMisc.cpp rename to dlls/tfcx/CMisc.cpp diff --git a/dlls/tfc/tfcx/CMisc.h b/dlls/tfcx/CMisc.h similarity index 100% rename from dlls/tfc/tfcx/CMisc.h rename to dlls/tfcx/CMisc.h diff --git a/dlls/tfc/tfcx/CRank.cpp b/dlls/tfcx/CRank.cpp similarity index 100% rename from dlls/tfc/tfcx/CRank.cpp rename to dlls/tfcx/CRank.cpp diff --git a/dlls/tfc/tfcx/CRank.h b/dlls/tfcx/CRank.h similarity index 100% rename from dlls/tfc/tfcx/CRank.h rename to dlls/tfcx/CRank.h diff --git a/dlls/tfc/tfcx/Makefile b/dlls/tfcx/Makefile similarity index 82% rename from dlls/tfc/tfcx/Makefile rename to dlls/tfcx/Makefile index 3272f77a..ec951116 100755 --- a/dlls/tfc/tfcx/Makefile +++ b/dlls/tfcx/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 ### @@ -13,12 +13,12 @@ NAME = tfcx BIN_SUFFIX = amxx_i386.so -OBJECTS = amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp +OBJECTS = sdk/amxxmodule.cpp CRank.cpp CMisc.cpp NBase.cpp NRank.cpp usermsg.cpp Utils.cpp moduleconfig.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -47,6 +47,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) tfcx tfcx: $(OBJ_LINUX) @@ -58,7 +59,9 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX) diff --git a/dlls/tfc/tfcx/NBase.cpp b/dlls/tfcx/NBase.cpp similarity index 100% rename from dlls/tfc/tfcx/NBase.cpp rename to dlls/tfcx/NBase.cpp diff --git a/dlls/tfc/tfcx/NRank.cpp b/dlls/tfcx/NRank.cpp similarity index 100% rename from dlls/tfc/tfcx/NRank.cpp rename to dlls/tfcx/NRank.cpp diff --git a/dlls/tfc/tfcx/Utils.cpp b/dlls/tfcx/Utils.cpp similarity index 100% rename from dlls/tfc/tfcx/Utils.cpp rename to dlls/tfcx/Utils.cpp diff --git a/dlls/tfc/tfcx/moduleconfig.cpp b/dlls/tfcx/moduleconfig.cpp similarity index 100% rename from dlls/tfc/tfcx/moduleconfig.cpp rename to dlls/tfcx/moduleconfig.cpp diff --git a/dlls/tfcx/msvc7/tfcx.sln b/dlls/tfcx/msvc7/tfcx.sln new file mode 100644 index 00000000..0b460173 --- /dev/null +++ b/dlls/tfcx/msvc7/tfcx.sln @@ -0,0 +1,23 @@ +Microsoft Visual Studio Solution File, Format Version 8.00 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tfcx", "tfcx.vcproj", "{87519113-8E9D-4C6F-BA1F-55F4D8829E83}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfiguration) = preSolution + Debug = Debug + Release = Release + EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection + GlobalSection(ProjectConfiguration) = postSolution + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Debug.ActiveCfg = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Debug.Build.0 = Debug|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Release.ActiveCfg = Release|Win32 + {87519113-8E9D-4C6F-BA1F-55F4D8829E83}.Release.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + EndGlobalSection + GlobalSection(ExtensibilityAddIns) = postSolution + EndGlobalSection +EndGlobal diff --git a/dlls/tfc/tfcx/msvc/tfcx.vcproj b/dlls/tfcx/msvc7/tfcx.vcproj similarity index 81% rename from dlls/tfc/tfcx/msvc/tfcx.vcproj rename to dlls/tfcx/msvc7/tfcx.vcproj index ab7cd15a..2e81e95a 100755 --- a/dlls/tfc/tfcx/msvc/tfcx.vcproj +++ b/dlls/tfcx/msvc7/tfcx.vcproj @@ -13,8 +13,8 @@ @@ -78,8 +78,8 @@ @@ -87,17 +87,17 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\amxmodx,..\..\metamod,..\..\sdk\common,..\..\sdk\engine,..\..\sdk\dlls" + AdditionalIncludeDirectories="..\sdk" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;tfcx_EXPORTS" StringPooling="TRUE" RuntimeLibrary="4" StructMemberAlignment="3" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\release/tfcx.pch" - AssemblerListingLocation=".\release/" - ObjectFile=".\release/" - ProgramDataBaseFileName=".\release/" + PrecompiledHeaderFile=".\Release/tfcx.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -106,11 +106,11 @@ Name="VCCustomBuildTool"/> @@ -148,28 +148,6 @@ - - - - - - - - - - - - + Name="Module SDK" + Filter=""> + + + + + + + + + + + + + + + + + + diff --git a/dlls/tfc/tfcx/msvc8/tfcx.sln b/dlls/tfcx/msvc8/tfcx.sln similarity index 100% rename from dlls/tfc/tfcx/msvc8/tfcx.sln rename to dlls/tfcx/msvc8/tfcx.sln diff --git a/dlls/tfc/tfcx/msvc8/tfcx.vcproj b/dlls/tfcx/msvc8/tfcx.vcproj similarity index 83% rename from dlls/tfc/tfcx/msvc8/tfcx.vcproj rename to dlls/tfcx/msvc8/tfcx.vcproj index 0a747dbe..466900f9 100644 --- a/dlls/tfc/tfcx/msvc8/tfcx.vcproj +++ b/dlls/tfcx/msvc8/tfcx.vcproj @@ -16,8 +16,8 @@ - - - - - - - - @@ -435,10 +408,6 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > - - @@ -447,19 +416,50 @@ RelativePath="..\CRank.h" > - - + + + + + + + + + + + + + + + + + + diff --git a/dlls/tfc/tfcx/amxxmodule.cpp b/dlls/tfcx/sdk/amxxmodule.cpp similarity index 100% rename from dlls/tfc/tfcx/amxxmodule.cpp rename to dlls/tfcx/sdk/amxxmodule.cpp diff --git a/dlls/tfc/tfcx/amxxmodule.h b/dlls/tfcx/sdk/amxxmodule.h similarity index 100% rename from dlls/tfc/tfcx/amxxmodule.h rename to dlls/tfcx/sdk/amxxmodule.h diff --git a/dlls/tfc/tfcx/moduleconfig.h b/dlls/tfcx/sdk/moduleconfig.h similarity index 100% rename from dlls/tfc/tfcx/moduleconfig.h rename to dlls/tfcx/sdk/moduleconfig.h diff --git a/dlls/tfc/tfcx/svn_version.h b/dlls/tfcx/sdk/svn_version.h similarity index 100% rename from dlls/tfc/tfcx/svn_version.h rename to dlls/tfcx/sdk/svn_version.h diff --git a/dlls/tfc/tfcx/svn_version.tpl b/dlls/tfcx/sdk/svn_version.tpl similarity index 100% rename from dlls/tfc/tfcx/svn_version.tpl rename to dlls/tfcx/sdk/svn_version.tpl diff --git a/dlls/tfc/tfcx/tfcx.h b/dlls/tfcx/tfcx.h similarity index 100% rename from dlls/tfc/tfcx/tfcx.h rename to dlls/tfcx/tfcx.h diff --git a/dlls/tfc/tfcx/usermsg.cpp b/dlls/tfcx/usermsg.cpp similarity index 100% rename from dlls/tfc/tfcx/usermsg.cpp rename to dlls/tfcx/usermsg.cpp diff --git a/dlls/ts/tsfun/Makefile b/dlls/ts/tsfun/Makefile index f747ad28..062eb69a 100755 --- a/dlls/ts/tsfun/Makefile +++ b/dlls/ts/tsfun/Makefile @@ -13,12 +13,12 @@ NAME = tsfun BIN_SUFFIX = amxx_i386.so -OBJECTS = amxxmodule.cpp +OBJECTS = sdk/amxxmodule.cpp LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -47,6 +47,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) tsfun tsfun: $(OBJ_LINUX) @@ -58,7 +59,9 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX) diff --git a/dlls/ts/tsfun/tsfun.sln b/dlls/ts/tsfun/msvc7/tsfun.sln similarity index 100% rename from dlls/ts/tsfun/tsfun.sln rename to dlls/ts/tsfun/msvc7/tsfun.sln diff --git a/dlls/ts/tsfun/tsfun.vcproj b/dlls/ts/tsfun/msvc7/tsfun.vcproj similarity index 82% rename from dlls/ts/tsfun/tsfun.vcproj rename to dlls/ts/tsfun/msvc7/tsfun.vcproj index 51b64e39..f5471414 100755 --- a/dlls/ts/tsfun/tsfun.vcproj +++ b/dlls/ts/tsfun/msvc7/tsfun.vcproj @@ -141,39 +141,24 @@ + Name="Module SDK" + Filter=""> - - - - - - - - - - + RelativePath="..\sdk\moduleconfig.h"> + RelativePath="..\sdk\svn_version.h"> - - + + + + + + diff --git a/dlls/ts/tsfun/msvc8/tsfun.vcproj b/dlls/ts/tsfun/msvc8/tsfun.vcproj index 57b94a4b..2445202b 100644 --- a/dlls/ts/tsfun/msvc8/tsfun.vcproj +++ b/dlls/ts/tsfun/msvc8/tsfun.vcproj @@ -75,6 +75,7 @@ /> - - - - + + + + + + diff --git a/dlls/ts/tsfun/amxxmodule.cpp b/dlls/ts/tsfun/sdk/amxxmodule.cpp similarity index 100% rename from dlls/ts/tsfun/amxxmodule.cpp rename to dlls/ts/tsfun/sdk/amxxmodule.cpp diff --git a/dlls/ts/tsfun/amxxmodule.h b/dlls/ts/tsfun/sdk/amxxmodule.h similarity index 100% rename from dlls/ts/tsfun/amxxmodule.h rename to dlls/ts/tsfun/sdk/amxxmodule.h diff --git a/dlls/ts/tsfun/moduleconfig.h b/dlls/ts/tsfun/sdk/moduleconfig.h similarity index 100% rename from dlls/ts/tsfun/moduleconfig.h rename to dlls/ts/tsfun/sdk/moduleconfig.h diff --git a/dlls/ts/tsfun/svn_version.h b/dlls/ts/tsfun/sdk/svn_version.h similarity index 100% rename from dlls/ts/tsfun/svn_version.h rename to dlls/ts/tsfun/sdk/svn_version.h diff --git a/dlls/ts/tsfun/svn_version.tpl b/dlls/ts/tsfun/sdk/svn_version.tpl similarity index 100% rename from dlls/ts/tsfun/svn_version.tpl rename to dlls/ts/tsfun/sdk/svn_version.tpl diff --git a/dlls/ts/tsfun/tsfun.dsw b/dlls/ts/tsfun/tsfun.dsw deleted file mode 100755 index 2e755c89..00000000 --- a/dlls/ts/tsfun/tsfun.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "tsx"=".\tsx.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/dlls/ts/tsx/Makefile b/dlls/ts/tsx/Makefile index c5c800f8..7cf75b3b 100755 --- a/dlls/ts/tsx/Makefile +++ b/dlls/ts/tsx/Makefile @@ -13,14 +13,13 @@ NAME = tsx BIN_SUFFIX = amxx_i386.so -OBJECTS = CMisc.cpp CRank.cpp NBase.cpp NRank.cpp \ - Utils.cpp amxxmodule.cpp moduleconfig.cpp \ - usermsg.cpp +OBJECTS = sdk/amxxmodule.cpp CMisc.cpp CRank.cpp NBase.cpp \ + NRank.cpp Utils.cpp moduleconfig.cpp usermsg.cpp \ LINK = INCLUDE = -I. -I$(HLSDK) -I$(HLSDK)/dlls -I$(HLSDK)/engine -I$(HLSDK)/game_shared -I$(HLSDK)/game_shared \ - -I$(MM_ROOT) -I$(HLSDK)/common + -I$(MM_ROOT) -I$(HLSDK)/common -Isdk GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) @@ -49,6 +48,7 @@ $(BIN_DIR)/%.o: %.cpp all: mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/sdk $(MAKE) tsx tsx: $(OBJ_LINUX) @@ -60,7 +60,9 @@ debug: default: all clean: + rm -rf Release/sdk/*.o rm -rf Release/*.o rm -rf Release/$(NAME)_$(BIN_SUFFIX) + rm -rf Debug/sdk/*.o rm -rf Debug/*.o rm -rf Debug/$(NAME)_$(BIN_SUFFIX) diff --git a/dlls/ts/tsx/msvc/tsx_amxx.dsp b/dlls/ts/tsx/msvc/tsx_amxx.dsp deleted file mode 100755 index da5cc15d..00000000 --- a/dlls/ts/tsx/msvc/tsx_amxx.dsp +++ /dev/null @@ -1,157 +0,0 @@ -# Microsoft Developer Studio Project File - Name="tsx_amxx" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=tsx_amxx - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "tsx_amxx.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "tsx_amxx.mak" CFG="tsx_amxx - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "tsx_amxx - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "tsx_amxx - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "tsx_amxx - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "release" -# PROP Intermediate_Dir "release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "tsx_amxx_EXPORTS" /YX /FD /c -# ADD CPP /nologo /Zp4 /MT /W3 /GX /O2 /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "tsx_amxx_EXPORTS" /FR /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# SUBTRACT LINK32 /pdb:none - -!ELSEIF "$(CFG)" == "tsx_amxx - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "debug" -# PROP Intermediate_Dir "debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "tsx_amxx_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\metamod" /I "..\..\sdk\common" /I "..\..\sdk\engine" /I "..\..\sdk\dlls" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "tsx_amxx_EXPORTS" /FR /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none - -!ENDIF - -# Begin Target - -# Name "tsx_amxx - Win32 Release" -# Name "tsx_amxx - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\amxxmodule.cpp -# End Source File -# Begin Source File - -SOURCE=..\CMisc.cpp -# End Source File -# Begin Source File - -SOURCE=..\CRank.cpp -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.cpp -# End Source File -# Begin Source File - -SOURCE=..\NBase.cpp -# End Source File -# Begin Source File - -SOURCE=..\NRank.cpp -# End Source File -# Begin Source File - -SOURCE=..\usermsg.cpp -# End Source File -# Begin Source File - -SOURCE=..\Utils.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Source File - -SOURCE=..\amxxmodule.h -# End Source File -# Begin Source File - -SOURCE=..\CMisc.h -# End Source File -# Begin Source File - -SOURCE=..\CRank.h -# End Source File -# Begin Source File - -SOURCE=..\moduleconfig.h -# End Source File -# Begin Source File - -SOURCE=..\tsx.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/dlls/ts/tsx/msvc/tsx_amxx.dsw b/dlls/ts/tsx/msvc/tsx_amxx.dsw deleted file mode 100755 index be185461..00000000 --- a/dlls/ts/tsx/msvc/tsx_amxx.dsw +++ /dev/null @@ -1,30 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "tsx_amxx"=.\tsx_amxx.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - - diff --git a/dlls/ts/tsx/msvc/tsx_amxx.sln b/dlls/ts/tsx/msvc7/tsx.sln similarity index 84% rename from dlls/ts/tsx/msvc/tsx_amxx.sln rename to dlls/ts/tsx/msvc7/tsx.sln index 7e902f1d..ca6764bd 100644 --- a/dlls/ts/tsx/msvc/tsx_amxx.sln +++ b/dlls/ts/tsx/msvc7/tsx.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx_amxx", "tsx_amxx.vcproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx", "tsx.vcproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject diff --git a/dlls/ts/tsx/msvc/tsx_amxx.vcproj b/dlls/ts/tsx/msvc7/tsx.vcproj similarity index 75% rename from dlls/ts/tsx/msvc/tsx_amxx.vcproj rename to dlls/ts/tsx/msvc7/tsx.vcproj index 68d62e88..bbe3b5ba 100755 --- a/dlls/ts/tsx/msvc/tsx_amxx.vcproj +++ b/dlls/ts/tsx/msvc7/tsx.vcproj @@ -2,7 +2,7 @@ @@ -13,8 +13,8 @@ @@ -78,8 +78,8 @@ @@ -87,17 +87,17 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\..\metamod,..\..\sdk\common,..\..\sdk\engine,..\..\sdk\dlls" + AdditionalIncludeDirectories="..\sdk" PreprocessorDefinitions="tsx_amxx_EXPORTS" StringPooling="TRUE" RuntimeLibrary="4" StructMemberAlignment="3" EnableFunctionLevelLinking="TRUE" UsePrecompiledHeader="2" - PrecompiledHeaderFile=".\release/tsx_amxx.pch" - AssemblerListingLocation=".\release/" - ObjectFile=".\release/" - ProgramDataBaseFileName=".\release/" + PrecompiledHeaderFile=".\Release/tsx_amxx.pch" + AssemblerListingLocation=".\Release/" + ObjectFile=".\Release/" + ProgramDataBaseFileName=".\Release/" BrowseInformation="1" WarningLevel="3" SuppressStartupBanner="TRUE" @@ -106,11 +106,11 @@ Name="VCCustomBuildTool"/> @@ -148,28 +148,6 @@ - - - - - - - - - - - - @@ -272,8 +244,24 @@ + Name="Module SDK" + Filter=""> + + + + + + + + + + diff --git a/dlls/ts/tsx/msvc8/tsx_amxx.sln b/dlls/ts/tsx/msvc8/tsx.sln similarity index 83% rename from dlls/ts/tsx/msvc8/tsx_amxx.sln rename to dlls/ts/tsx/msvc8/tsx.sln index e4c29f08..3d690029 100644 --- a/dlls/ts/tsx/msvc8/tsx_amxx.sln +++ b/dlls/ts/tsx/msvc8/tsx.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx_amxx", "tsx_amxx.vcproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx", "tsx.vcproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/dlls/ts/tsx/msvc8/tsx_amxx.vcproj b/dlls/ts/tsx/msvc8/tsx.vcproj similarity index 77% rename from dlls/ts/tsx/msvc8/tsx_amxx.vcproj rename to dlls/ts/tsx/msvc8/tsx.vcproj index 0e3f3275..91acb7d8 100644 --- a/dlls/ts/tsx/msvc8/tsx_amxx.vcproj +++ b/dlls/ts/tsx/msvc8/tsx.vcproj @@ -2,9 +2,9 @@ - - - - - - - - @@ -343,10 +316,6 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > - - @@ -355,10 +324,6 @@ RelativePath="..\CRank.h" > - - @@ -369,9 +334,28 @@ + + + + + + + + + + diff --git a/dlls/ts/tsx/amxxmodule.cpp b/dlls/ts/tsx/sdk/amxxmodule.cpp similarity index 100% rename from dlls/ts/tsx/amxxmodule.cpp rename to dlls/ts/tsx/sdk/amxxmodule.cpp diff --git a/dlls/ts/tsx/amxxmodule.h b/dlls/ts/tsx/sdk/amxxmodule.h similarity index 100% rename from dlls/ts/tsx/amxxmodule.h rename to dlls/ts/tsx/sdk/amxxmodule.h diff --git a/dlls/ts/tsx/moduleconfig.h b/dlls/ts/tsx/sdk/moduleconfig.h similarity index 100% rename from dlls/ts/tsx/moduleconfig.h rename to dlls/ts/tsx/sdk/moduleconfig.h diff --git a/dlls/ts/tsx/svn_version.h b/dlls/ts/tsx/sdk/svn_version.h similarity index 100% rename from dlls/ts/tsx/svn_version.h rename to dlls/ts/tsx/sdk/svn_version.h diff --git a/dlls/ts/tsx/svn_version.tpl b/dlls/ts/tsx/sdk/svn_version.tpl similarity index 100% rename from dlls/ts/tsx/svn_version.tpl rename to dlls/ts/tsx/sdk/svn_version.tpl diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe index ef09bdb6..30432d75 100755 Binary files a/installer/AMXXRelease/AMXXRelease.exe and b/installer/AMXXRelease/AMXXRelease.exe differ diff --git a/installer/AMXXRelease/AMod.cs b/installer/AMXXRelease/AMod.cs index ec0fa060..8fac4657 100755 --- a/installer/AMXXRelease/AMod.cs +++ b/installer/AMXXRelease/AMod.cs @@ -34,6 +34,7 @@ public Module() { build = "Release"; outdir = "modules"; + bindir = "msvc7"; } public Module(string name) @@ -41,6 +42,7 @@ public Module(string name) build = "Release"; outdir = "modules"; sourcedir = "dlls\\" + name; + bindir = "msvc7"; projname = name + "_amxx"; vcproj = name; } diff --git a/installer/AMXXRelease/CoreMod.cs b/installer/AMXXRelease/CoreMod.cs index 09715da1..55f12b29 100755 --- a/installer/AMXXRelease/CoreMod.cs +++ b/installer/AMXXRelease/CoreMod.cs @@ -129,34 +129,16 @@ private void AddModules() { Module core = new Module(); - core.bindir = "msvc"; core.sourcedir = "amxmodx"; core.vcproj = "amxmodx_mm"; core.build = "JITRelease"; core.projname = "amxmodx_mm"; core.outdir = "dlls"; - Module mysqlx = new Module(); - mysqlx.projname = "mysql_amxx"; - mysqlx.sourcedir = "dlls\\" + "mysqlx"; - mysqlx.vcproj = "mysql2"; - - Module sqlitex = new Module(); - sqlitex.projname = "sqlite_amxx"; - sqlitex.sourcedir = "dlls\\" + "sqlite"; - sqlitex.bindir = "msvc7"; - sqlitex.vcproj = "sqlite_amxx"; - - Module engine = new Module(); - engine.sourcedir = "dlls\\engine"; - engine.projname = "engine_amxx"; - engine.vcproj = "engine"; - - Module fun = new Module(); - fun.sourcedir = "dlls\\fun"; - fun.projname = "fun_amxx"; - fun.vcproj = "fun"; - + Module mysqlx = new Module("mysqlx"); + Module sqlitex = new Module("sqlite"); + Module engine = new Module("engine"); + Module fun = new Module("fun"); Module geoip = new Module("geoip"); Module fakemeta = new Module("fakemeta"); Module sockets = new Module("sockets"); diff --git a/installer/AMXXRelease/ModCstrike.cs b/installer/AMXXRelease/ModCstrike.cs index 68a1aab6..26e5fa6a 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\\csx\\source\\WinCSX\\Release\\WinCSX.exe", + File.Copy(source + "\\dlls\\csx\\WinCSX\\Release\\WinCSX.exe", basedir + "\\data\\WinCSX.exe", true); } @@ -47,16 +47,8 @@ public override sealed bool CopyExtraFiles(ABuilder ab, string basedir, string s private void AddModules() { - Module csx = new Module(); - csx.sourcedir = "dlls\\csx\\source"; - csx.projname = "csx_amxx"; - csx.bindir = "msvc"; - csx.vcproj = "csx"; - - Module cstrike = new Module(); - cstrike.sourcedir = "dlls\\cstrike"; - cstrike.projname = "cstrike_amxx"; - cstrike.vcproj = "cstrike"; + Module csx = new Module("csx"); + Module cstrike = new Module("cstrike"); m_Modules.Add(csx); m_Modules.Add(cstrike); diff --git a/installer/AMXXRelease/ModDoD.cs b/installer/AMXXRelease/ModDoD.cs index 59dd73b3..94aeb8c1 100755 --- a/installer/AMXXRelease/ModDoD.cs +++ b/installer/AMXXRelease/ModDoD.cs @@ -32,13 +32,11 @@ private void AddModules() Module dodx = new Module(); dodx.sourcedir = "dlls\\dod2\\dodx"; dodx.projname = "dodx_amxx"; - dodx.bindir = "msvc"; dodx.vcproj = "dodx"; Module dodfun = new Module(); dodfun.sourcedir = "dlls\\dod2\\dodfun"; dodfun.projname = "dodfun_amxx"; - dodfun.bindir = "msvc"; dodfun.vcproj = "dodfun"; m_Modules.Add(dodx); diff --git a/installer/AMXXRelease/ModNs.cs b/installer/AMXXRelease/ModNs.cs index 88fba337..80e287b4 100755 --- a/installer/AMXXRelease/ModNs.cs +++ b/installer/AMXXRelease/ModNs.cs @@ -28,11 +28,7 @@ private void AddPlugins() private void AddModules() { - Module ns = new Module(); - - ns.sourcedir = "dlls\\ns\\ns"; - ns.projname = "ns_amxx"; - ns.vcproj = "ns"; + Module ns = new Module("ns"); m_Modules.Add(ns); } diff --git a/installer/AMXXRelease/ModTFC.cs b/installer/AMXXRelease/ModTFC.cs index af675f17..c7c27799 100755 --- a/installer/AMXXRelease/ModTFC.cs +++ b/installer/AMXXRelease/ModTFC.cs @@ -28,12 +28,7 @@ private void AddPlugins() private void AddModules() { - Module tfcx = new Module(); - - tfcx.sourcedir = "dlls\\tfc\\tfcx"; - tfcx.vcproj = "tfcx"; - tfcx.projname = "tfcx_amxx"; - tfcx.bindir = "msvc"; + Module tfcx = new Module("tfcx"); m_Modules.Add(tfcx); } diff --git a/installer/AMXXRelease/ModTs.cs b/installer/AMXXRelease/ModTs.cs index a090f76f..da522530 100755 --- a/installer/AMXXRelease/ModTs.cs +++ b/installer/AMXXRelease/ModTs.cs @@ -30,8 +30,7 @@ private void AddModules() Module tsx = new Module(); tsx.sourcedir = "dlls\\ts\\tsx"; tsx.projname = "tsx_amxx"; - tsx.bindir = "msvc"; - tsx.vcproj = "tsx_amxx"; + tsx.vcproj = "tsx"; Module tsfun = new Module(); tsfun.sourcedir = "dlls\\ts\\tsfun";