diff --git a/amxmodx/Makefile b/amxmodx/Makefile index 908e2b70..482575df 100755 --- a/amxmodx/Makefile +++ b/amxmodx/Makefile @@ -49,7 +49,7 @@ ifeq "$(BINLOG)" "true" CFLAGS += -DBINLOG_ENABLED endif -CFLAGS += -DLINUX -DAMX_NOPROPLIST -fPIC -Wall -Werror -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions +CFLAGS += -DLINUX -DAMX_NOPROPLIST -Wall -Werror -DHAVE_STDINT_H -static-libgcc -fno-rtti -fno-exceptions ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/amxmodx/msvc7/amxmodx_mm.sln b/amxmodx/msvc7/amxmodx_mm.sln deleted file mode 100755 index 1cea3cc4..00000000 --- a/amxmodx/msvc7/amxmodx_mm.sln +++ /dev/null @@ -1,27 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx", "amxmodx_mm.vcproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - JITDebug = JITDebug - JITDebugBinLog = JITDebugBinLog - JITRelease = JITRelease - JITReleaseBinLog = JITReleaseBinLog - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.ActiveCfg = JITDebug|Win32 - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebug.Build.0 = JITDebug|Win32 - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog.ActiveCfg = JITDebugBinLog|Win32 - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITDebugBinLog.Build.0 = JITDebugBinLog|Win32 - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.ActiveCfg = JITRelease|Win32 - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITRelease.Build.0 = JITRelease|Win32 - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog.ActiveCfg = JITReleaseBinLog|Win32 - {2BF64D1A-AC89-41B0-9D02-FB8CB610F850}.JITReleaseBinLog.Build.0 = JITReleaseBinLog|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/amxmodx/msvc7/amxmodx_mm.vcproj b/amxmodx/msvc7/amxmodx_mm.vcproj deleted file mode 100755 index 7d6ff634..00000000 --- a/amxmodx/msvc7/amxmodx_mm.vcproj +++ /dev/null @@ -1,795 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/amxmodx/msvc8/amxmodx_mm.sln b/amxmodx/msvc8/amxmodx_mm.sln index 0ae1e53a..a7921c18 100644 --- a/amxmodx/msvc8/amxmodx_mm.sln +++ b/amxmodx/msvc8/amxmodx_mm.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C++ Express 2008 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxmodx_mm", "amxmodx_mm.vcproj", "{2BF64D1A-AC89-41B0-9D02-FB8CB610F850}" EndProject Global diff --git a/amxmodx/msvc8/amxmodx_mm.vcproj b/amxmodx/msvc8/amxmodx_mm.vcproj index 0ce1a403..f87046b6 100644 --- a/amxmodx/msvc8/amxmodx_mm.vcproj +++ b/amxmodx/msvc8/amxmodx_mm.vcproj @@ -1,11 +1,10 @@ + @@ -153,7 +153,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include" + AdditionalIncludeDirectories=""$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls";"$(HLSDK)\pm_shared"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;_CRT_SECURE_NO_DEPRECATE" IgnoreStandardIncludePath="false" StringPooling="true" @@ -192,13 +192,11 @@ LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\extra\lib_win32" - IgnoreDefaultLibraryNames="MSVCRT;LIBC" + IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD" ModuleDefinitionFile="" GenerateDebugInformation="true" ProgramDatabaseFile=".\jitrelease/amxmodx_mm.pdb" GenerateMapFile="true" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" ImportLibrary=".\jitrelease/amxmodx_mm.lib" /> + @@ -256,7 +257,7 @@ + @@ -361,7 +363,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\..\metamod\metamod,..\..\hlsdk\sourcecode\common,..\..\hlsdk\sourcecode\engine,..\..\hlsdk\sourcecode\dlls,..\..\hlsdk\sourcecode\pm_shared,..\extra\include" + AdditionalIncludeDirectories=""$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls";"$(HLSDK)\pm_shared"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;amxmodx_EXPORTS;JIT;ASM32;PAWN_CELL_SIZE=32;BINLOG_ENABLED;_CRT_SECURE_NO_DEPRECATE" IgnoreStandardIncludePath="false" StringPooling="true" @@ -399,13 +401,11 @@ LinkIncremental="1" SuppressStartupBanner="true" AdditionalLibraryDirectories="..\extra\lib_win32" - IgnoreDefaultLibraryNames="MSVCRT;LIBC" + IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD" ModuleDefinitionFile="" GenerateDebugInformation="true" ProgramDatabaseFile=".\jitreleasebinlog/amxmodx_bl_mm.pdb" GenerateMapFile="true" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" ImportLibrary=".\jitreleasebinlog/amxmodx_bl_mm.lib" /> + diff --git a/amxmodx/zlib/zconf.h b/amxmodx/zlib/zconf.h index 3cea897e..03a9431c 100755 --- a/amxmodx/zlib/zconf.h +++ b/amxmodx/zlib/zconf.h @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -13,43 +13,50 @@ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. */ #ifdef Z_PREFIX -# define deflateInit_ z_deflateInit_ -# define deflate z_deflate -# define deflateEnd z_deflateEnd -# define inflateInit_ z_inflateInit_ -# define inflate z_inflate -# define inflateEnd z_inflateEnd -# define deflateInit2_ z_deflateInit2_ -# define deflateSetDictionary z_deflateSetDictionary -# define deflateCopy z_deflateCopy -# define deflateReset z_deflateReset -# define deflatePrime z_deflatePrime -# define deflateParams z_deflateParams -# define deflateBound z_deflateBound -# define inflateInit2_ z_inflateInit2_ -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateSyncPoint z_inflateSyncPoint -# define inflateCopy z_inflateCopy -# define inflateReset z_inflateReset -# define compress z_compress -# define compress2 z_compress2 -# define compressBound z_compressBound -# define uncompress z_uncompress -# define adler32 z_adler32 -# define crc32 z_crc32 -# define get_crc_table z_get_crc_table +# define deflateInit_ z_deflateInit_ +# define deflate z_deflate +# define deflateEnd z_deflateEnd +# define inflateInit_ z_inflateInit_ +# define inflate z_inflate +# define inflateEnd z_inflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateSetDictionary z_deflateSetDictionary +# define deflateCopy z_deflateCopy +# define deflateReset z_deflateReset +# define deflateParams z_deflateParams +# define deflateBound z_deflateBound +# define deflatePrime z_deflatePrime +# define inflateInit2_ z_inflateInit2_ +# define inflateSetDictionary z_inflateSetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateCopy z_inflateCopy +# define inflateReset z_inflateReset +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define compress z_compress +# define compress2 z_compress2 +# define compressBound z_compressBound +# define uncompress z_uncompress +# define adler32 z_adler32 +# define crc32 z_crc32 +# define get_crc_table z_get_crc_table +# define zError z_zError -# define Byte z_Byte -# define uInt z_uInt -# define uLong z_uLong -# define Bytef z_Bytef -# define charf z_charf -# define intf z_intf -# define uIntf z_uIntf -# define uLongf z_uLongf -# define voidpf z_voidpf -# define voidp z_voidp +# define alloc_func z_alloc_func +# define free_func z_free_func +# define in_func z_in_func +# define out_func z_out_func +# define Byte z_Byte +# define uInt z_uInt +# define uLong z_uLong +# define Bytef z_Bytef +# define charf z_charf +# define intf z_intf +# define uIntf z_uIntf +# define uLongf z_uLongf +# define voidpf z_voidpf +# define voidp z_voidp #endif #if defined(__MSDOS__) && !defined(MSDOS) @@ -61,8 +68,10 @@ #if defined(_WINDOWS) && !defined(WINDOWS) # define WINDOWS #endif -#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) -# define WIN32 +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif #endif #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) # if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) @@ -281,7 +290,7 @@ typedef uLong FAR uLongf; # ifdef VMS # include /* for off_t */ # endif -# define z_off_t off_t +# define z_off_t off_t #endif #ifndef SEEK_SET # define SEEK_SET 0 /* Seek from beginning of file. */ @@ -289,11 +298,11 @@ typedef uLong FAR uLongf; # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ #endif #ifndef z_off_t -# define z_off_t long +# define z_off_t long #endif #if defined(__OS400__) -#define NO_vsnprintf +# define NO_vsnprintf #endif #if defined(__MVS__) diff --git a/amxmodx/zlib/zlib.lib b/amxmodx/zlib/zlib.lib index 642b762e..6a5dc759 100755 Binary files a/amxmodx/zlib/zlib.lib and b/amxmodx/zlib/zlib.lib differ diff --git a/compiler/amxxpc/amxxpc.cpp b/compiler/amxxpc/amxxpc.cpp index 56c0b7ec..0f333352 100755 --- a/compiler/amxxpc/amxxpc.cpp +++ b/compiler/amxxpc/amxxpc.cpp @@ -12,6 +12,13 @@ #include "amxxpc.h" #include "Binary.h" +#ifdef _MSC_VER + // MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated + #if _MSC_VER >= 1400 + #define unlink _unlink + #endif +#endif + static PRINTF pc_printf = NULL; void ReadFileIntoPl(abl *pl, FILE *fp); diff --git a/compiler/amxxpc/amxxpc.h b/compiler/amxxpc/amxxpc.h index cde47ee9..accec6dd 100755 --- a/compiler/amxxpc/amxxpc.h +++ b/compiler/amxxpc/amxxpc.h @@ -1,7 +1,7 @@ #ifndef _AMXXSC_INCLUDE_H #define _AMXXSC_INCLUDE_H -#define VERSION_STRING "1.76-300" +#define VERSION_STRING "1.8.1-300" #define MAGIC_HEADER2 0x414D5858 #define MAGIC_VERSION 0x0300 diff --git a/compiler/amxxpc/amxxpc.sln b/compiler/amxxpc/amxxpc.sln index a397c2e0..63d9dfd1 100755 --- a/compiler/amxxpc/amxxpc.sln +++ b/compiler/amxxpc/amxxpc.sln @@ -1,21 +1,20 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "amxxpc", "amxxpc.vcproj", "{39412290-D01C-472F-A439-AB5592A04C08}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {39412290-D01C-472F-A439-AB5592A04C08}.Debug.ActiveCfg = Debug|Win32 - {39412290-D01C-472F-A439-AB5592A04C08}.Debug.Build.0 = Debug|Win32 - {39412290-D01C-472F-A439-AB5592A04C08}.Release.ActiveCfg = Release|Win32 - {39412290-D01C-472F-A439-AB5592A04C08}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.ActiveCfg = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.Debug|Win32.Build.0 = Debug|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.ActiveCfg = Release|Win32 + {39412290-D01C-472F-A439-AB5592A04C08}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/compiler/amxxpc/amxxpc.vcproj b/compiler/amxxpc/amxxpc.vcproj index c35d82bd..078cbbbd 100755 --- a/compiler/amxxpc/amxxpc.vcproj +++ b/compiler/amxxpc/amxxpc.vcproj @@ -1,111 +1,178 @@ + RootNamespace="amxxpc" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -114,58 +181,75 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\amx.cpp" + > + RelativePath=".\amxxpc.cpp" + > + RelativePath=".\Binary.cpp" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\amx.h" + > + RelativePath=".\amxdbg.h" + > + RelativePath=".\amxxpc.h" + > + RelativePath=".\Binary.h" + > + RelativePath=".\osdefs.h" + > + RelativePath=".\resource.h" + > + RelativePath=".\resource1.h" + > + RelativePath=".\sclinux.h" + > + RelativePath=".\zconf.h" + > + RelativePath=".\zlib.h" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + RelativePath=".\amxxpc1.rc" + > diff --git a/compiler/amxxpc/libz.a b/compiler/amxxpc/libz.a index 4ffe30e0..2e7361e4 100755 Binary files a/compiler/amxxpc/libz.a and b/compiler/amxxpc/libz.a differ diff --git a/compiler/amxxpc/zconf.h b/compiler/amxxpc/zconf.h index 3cea897e..03a9431c 100755 --- a/compiler/amxxpc/zconf.h +++ b/compiler/amxxpc/zconf.h @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2003 Jean-loup Gailly. + * Copyright (C) 1995-2005 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -13,43 +13,50 @@ * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. */ #ifdef Z_PREFIX -# define deflateInit_ z_deflateInit_ -# define deflate z_deflate -# define deflateEnd z_deflateEnd -# define inflateInit_ z_inflateInit_ -# define inflate z_inflate -# define inflateEnd z_inflateEnd -# define deflateInit2_ z_deflateInit2_ -# define deflateSetDictionary z_deflateSetDictionary -# define deflateCopy z_deflateCopy -# define deflateReset z_deflateReset -# define deflatePrime z_deflatePrime -# define deflateParams z_deflateParams -# define deflateBound z_deflateBound -# define inflateInit2_ z_inflateInit2_ -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateSyncPoint z_inflateSyncPoint -# define inflateCopy z_inflateCopy -# define inflateReset z_inflateReset -# define compress z_compress -# define compress2 z_compress2 -# define compressBound z_compressBound -# define uncompress z_uncompress -# define adler32 z_adler32 -# define crc32 z_crc32 -# define get_crc_table z_get_crc_table +# define deflateInit_ z_deflateInit_ +# define deflate z_deflate +# define deflateEnd z_deflateEnd +# define inflateInit_ z_inflateInit_ +# define inflate z_inflate +# define inflateEnd z_inflateEnd +# define deflateInit2_ z_deflateInit2_ +# define deflateSetDictionary z_deflateSetDictionary +# define deflateCopy z_deflateCopy +# define deflateReset z_deflateReset +# define deflateParams z_deflateParams +# define deflateBound z_deflateBound +# define deflatePrime z_deflatePrime +# define inflateInit2_ z_inflateInit2_ +# define inflateSetDictionary z_inflateSetDictionary +# define inflateSync z_inflateSync +# define inflateSyncPoint z_inflateSyncPoint +# define inflateCopy z_inflateCopy +# define inflateReset z_inflateReset +# define inflateBack z_inflateBack +# define inflateBackEnd z_inflateBackEnd +# define compress z_compress +# define compress2 z_compress2 +# define compressBound z_compressBound +# define uncompress z_uncompress +# define adler32 z_adler32 +# define crc32 z_crc32 +# define get_crc_table z_get_crc_table +# define zError z_zError -# define Byte z_Byte -# define uInt z_uInt -# define uLong z_uLong -# define Bytef z_Bytef -# define charf z_charf -# define intf z_intf -# define uIntf z_uIntf -# define uLongf z_uLongf -# define voidpf z_voidpf -# define voidp z_voidp +# define alloc_func z_alloc_func +# define free_func z_free_func +# define in_func z_in_func +# define out_func z_out_func +# define Byte z_Byte +# define uInt z_uInt +# define uLong z_uLong +# define Bytef z_Bytef +# define charf z_charf +# define intf z_intf +# define uIntf z_uIntf +# define uLongf z_uLongf +# define voidpf z_voidpf +# define voidp z_voidp #endif #if defined(__MSDOS__) && !defined(MSDOS) @@ -61,8 +68,10 @@ #if defined(_WINDOWS) && !defined(WINDOWS) # define WINDOWS #endif -#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) -# define WIN32 +#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) +# ifndef WIN32 +# define WIN32 +# endif #endif #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) # if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) @@ -281,7 +290,7 @@ typedef uLong FAR uLongf; # ifdef VMS # include /* for off_t */ # endif -# define z_off_t off_t +# define z_off_t off_t #endif #ifndef SEEK_SET # define SEEK_SET 0 /* Seek from beginning of file. */ @@ -289,11 +298,11 @@ typedef uLong FAR uLongf; # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ #endif #ifndef z_off_t -# define z_off_t long +# define z_off_t long #endif #if defined(__OS400__) -#define NO_vsnprintf +# define NO_vsnprintf #endif #if defined(__MVS__) diff --git a/compiler/amxxpc/zlib.h b/compiler/amxxpc/zlib.h index 92edf96f..02281792 100755 --- a/compiler/amxxpc/zlib.h +++ b/compiler/amxxpc/zlib.h @@ -1,7 +1,7 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.1, November 17th, 2003 + version 1.2.3, July 18th, 2005 - Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,8 +37,8 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.1" -#define ZLIB_VERNUM 0x1210 +#define ZLIB_VERSION "1.2.3" +#define ZLIB_VERNUM 0x1230 /* The 'zlib' compression library provides in-memory compression and @@ -53,24 +53,22 @@ extern "C" { application must provide more input and/or consume the output (providing more output space) before each call. - The compressed data format used by the in-memory functions is the zlib - format, which is a zlib wrapper documented in RFC 1950, wrapped around a - deflate stream, which is itself documented in RFC 1951. + The compressed data format used by default by the in-memory functions is + the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped + around a deflate stream, which is itself documented in RFC 1951. The library also supports reading and writing files in gzip (.gz) format with an interface similar to that of stdio using the functions that start with "gz". The gzip format is different from the zlib format. gzip is a gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. + This library can optionally read and write gzip streams in memory as well. + The zlib format was designed to be compact and fast for use in memory and on communications channels. The gzip format was designed for single- file compression on file systems, has a larger header than zlib to maintain directory information, and uses a different, slower check method than zlib. - This library does not provide any functions to write gzip files in memory. - However such functions could be easily written using zlib's deflate function, - the documentation in the gzip RFC, and the examples in gzio.c. - The library does not install any signal handler. The decoder checks the consistency of the compressed data, so the library should never crash even in case of corrupted input. @@ -97,13 +95,36 @@ typedef struct z_stream_s { free_func zfree; /* used to free the internal state */ voidpf opaque; /* private data object passed to zalloc and zfree */ - int data_type; /* best guess about the data type: ascii or binary */ + int data_type; /* best guess about the data type: binary or text */ uLong adler; /* adler32 value of the uncompressed data */ uLong reserved; /* reserved for future use */ } z_stream; typedef z_stream FAR *z_streamp; +/* + gzip header information passed to and from zlib routines. See RFC 1952 + for more details on the meanings of these fields. +*/ +typedef struct gz_header_s { + int text; /* true if compressed data believed to be text */ + uLong time; /* modification time */ + int xflags; /* extra flags (not used when writing a gzip file) */ + int os; /* operating system */ + Bytef *extra; /* pointer to extra field or Z_NULL if none */ + uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ + uInt extra_max; /* space at extra (only when reading header) */ + Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ + uInt name_max; /* space at name (only when reading header) */ + Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ + uInt comm_max; /* space at comment (only when reading header) */ + int hcrc; /* true if there was or will be a header crc */ + int done; /* true when done reading gzip header (not used + when writing a gzip file) */ +} gz_header; + +typedef gz_header FAR *gz_headerp; + /* The application must update next_in and avail_in when avail_in has dropped to zero. It must update next_out and avail_out when avail_out @@ -168,11 +189,13 @@ typedef z_stream FAR *z_streamp; #define Z_FILTERED 1 #define Z_HUFFMAN_ONLY 2 #define Z_RLE 3 +#define Z_FIXED 4 #define Z_DEFAULT_STRATEGY 0 /* compression strategy; see deflateInit2() below for details */ #define Z_BINARY 0 -#define Z_ASCII 1 +#define Z_TEXT 1 +#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ #define Z_UNKNOWN 2 /* Possible values of the data_type field (though see inflate()) */ @@ -246,6 +269,10 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); and with zero avail_out, it must be called again after making room in the output buffer because there might be more output pending. + Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to + decide how much data to accumualte before producing output, in order to + maximize compression. + If the parameter flush is set to Z_SYNC_FLUSH, all pending output is flushed to the output buffer and the output is aligned on a byte boundary, so that the decompressor can get all input data available so far. (In particular @@ -257,7 +284,7 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); Z_SYNC_FLUSH, and the compression state is reset so that decompression can restart from this point if previous compressed data has been damaged or if random access is desired. Using Z_FULL_FLUSH too often can seriously degrade - the compression. + compression. If deflate returns with avail_out == 0, this function must be called again with the same value of the flush parameter and more output space (updated @@ -282,8 +309,8 @@ ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); deflate() sets strm->adler to the adler32 checksum of all input read so far (that is, total_in bytes). - deflate() may update data_type if it can make a good guess about - the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered + deflate() may update strm->data_type if it can make a good guess about + the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered binary. This field is only for information purposes and does not affect the compression algorithm in any manner. @@ -365,11 +392,11 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much output as possible to the output buffer. Z_BLOCK requests that inflate() stop - if and when it get to the next deflate block boundary. When decoding the zlib - or gzip format, this will cause inflate() to return immediately after the - header and before the first block. When doing a raw inflate, inflate() will - go ahead and process the first block, and will return when it gets to the end - of that block, or when it runs out of data. + if and when it gets to the next deflate block boundary. When decoding the + zlib or gzip format, this will cause inflate() to return immediately after + the header and before the first block. When doing a raw inflate, inflate() + will go ahead and process the first block, and will return when it gets to + the end of that block, or when it runs out of data. The Z_BLOCK option assists in appending to or combining deflate streams. Also to assist in this, on return inflate() will set strm->data_type to the @@ -401,7 +428,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); because Z_BLOCK is used. If a preset dictionary is needed after this call (see inflateSetDictionary - below), inflate sets strm-adler to the adler32 checksum of the dictionary + below), inflate sets strm->adler to the adler32 checksum of the dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise it sets strm->adler to the adler32 checksum of all output produced so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described @@ -478,7 +505,8 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, 16 to windowBits to write a simple gzip header and trailer around the compressed data instead of a zlib wrapper. The gzip header will have no file name, no extra data, no comment, no modification time (set to zero), - no header crc, and the operating system will be set to 255 (unknown). + no header crc, and the operating system will be set to 255 (unknown). If a + gzip stream is being written, strm->adler is a crc32 instead of an adler32. The memLevel parameter specifies how much memory should be allocated for the internal compression state. memLevel=1 uses minimum memory but @@ -497,7 +525,9 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, Z_DEFAULT and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The strategy parameter only affects the compression ratio but not the correctness of the - compressed output even if it is not set appropriately. + compressed output even if it is not set appropriately. Z_FIXED prevents the + use of dynamic Huffman codes, allowing for a simpler decoder for special + applications. deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid @@ -526,7 +556,9 @@ ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, deflateInit or deflateInit2, a part of the dictionary may in effect be discarded, for example if the dictionary is larger than the window size in deflate or deflate2. Thus the strings most likely to be useful should be - put at the end of the dictionary, not at the front. + put at the end of the dictionary, not at the front. In addition, the + current implementation of deflate will use at most the window size minus + 262 bytes of the provided dictionary. Upon return of this function, strm->adler is set to the adler32 value of the dictionary; the decompressor may later use this value to determine @@ -592,6 +624,23 @@ ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, if strm->avail_out was zero. */ +ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, + int good_length, + int max_lazy, + int nice_length, + int max_chain)); +/* + Fine tune deflate's internal compression parameters. This should only be + used by someone who understands the algorithm used by zlib's deflate for + searching for the best matching string, and even then only by the most + fanatic optimizer trying to squeeze out the last compressed bit for their + specific input data. Read the deflate.c source code for the meaning of the + max_lazy, good_length, nice_length, and max_chain parameters. + + deflateTune() can be called after deflateInit() or deflateInit2(), and + returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. + */ + ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, uLong sourceLen)); /* @@ -617,6 +666,30 @@ ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, stream state was inconsistent. */ +ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, + gz_headerp head)); +/* + deflateSetHeader() provides gzip header information for when a gzip + stream is requested by deflateInit2(). deflateSetHeader() may be called + after deflateInit2() or deflateReset() and before the first call of + deflate(). The text, time, os, extra field, name, and comment information + in the provided gz_header structure are written to the gzip header (xflag is + ignored -- the extra flags are set according to the compression level). The + caller must assure that, if not Z_NULL, name and comment are terminated with + a zero byte, and that if extra is not Z_NULL, that extra_len bytes are + available there. If hcrc is true, a gzip header crc is included. Note that + the current versions of the command-line version of gzip (up through version + 1.3.x) do not support header crc's, and will report that it is a "multi-part + gzip file" and give up. + + If deflateSetHeader is not used, the default gzip header has text false, + the time set to zero, and os set to 255, with no extra, name, or comment + fields. The gzip header is returned to the default state by deflateReset(). + + deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + /* ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, int windowBits)); @@ -649,14 +722,15 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, windowBits can also be greater than 15 for optional gzip decoding. Add 32 to windowBits to enable zlib and gzip decoding with automatic header detection, or add 16 to decode only the gzip format (the zlib format will - return a Z_DATA_ERROR). + return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is + a crc32 instead of an adler32. inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative - memLevel). msg is set to null if there is no error message. inflateInit2 - does not perform any decompression apart from reading the zlib header if - present: this will be done by inflate(). (So next_in and avail_in may be - modified, but next_out and avail_out are unchanged.) + memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg + is set to null if there is no error message. inflateInit2 does not perform + any decompression apart from reading the zlib header if present: this will + be done by inflate(). (So next_in and avail_in may be modified, but next_out + and avail_out are unchanged.) */ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, @@ -664,11 +738,14 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, uInt dictLength)); /* Initializes the decompression dictionary from the given uncompressed byte - sequence. This function must be called immediately after a call of inflate - if this call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the adler32 value returned by this call of - inflate. The compressor and decompressor must use exactly the same - dictionary (see deflateSetDictionary). + sequence. This function must be called immediately after a call of inflate, + if that call returned Z_NEED_DICT. The dictionary chosen by the compressor + can be determined from the adler32 value returned by that call of inflate. + The compressor and decompressor must use exactly the same dictionary (see + deflateSetDictionary). For raw inflate, this function can be called + immediately after inflateInit2() or inflateReset() and before any call of + inflate() to set the dictionary. The application must insure that the + dictionary that was used for compression is provided. inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a parameter is invalid (such as NULL dictionary) or the stream state is @@ -719,8 +796,64 @@ ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); stream state was inconsistent (such as zalloc or state being NULL). */ +ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, + int bits, + int value)); /* -ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits, + This function inserts bits in the inflate input stream. The intent is + that this function is used to start inflating at a bit position in the + middle of a byte. The provided bits will be used before any bytes are used + from next_in. This function should only be used with raw inflate, and + should be used before the first inflate() call after inflateInit2() or + inflateReset(). bits must be less than or equal to 16, and that many of the + least significant bits of value will be inserted in the input. + + inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, + gz_headerp head)); +/* + inflateGetHeader() requests that gzip header information be stored in the + provided gz_header structure. inflateGetHeader() may be called after + inflateInit2() or inflateReset(), and before the first call of inflate(). + As inflate() processes the gzip stream, head->done is zero until the header + is completed, at which time head->done is set to one. If a zlib stream is + being decoded, then head->done is set to -1 to indicate that there will be + no gzip header information forthcoming. Note that Z_BLOCK can be used to + force inflate() to return immediately after header processing is complete + and before any actual data is decompressed. + + The text, time, xflags, and os fields are filled in with the gzip header + contents. hcrc is set to true if there is a header CRC. (The header CRC + was valid if done is set to one.) If extra is not Z_NULL, then extra_max + contains the maximum number of bytes to write to extra. Once done is true, + extra_len contains the actual extra field length, and extra contains the + extra field, or that field truncated if extra_max is less than extra_len. + If name is not Z_NULL, then up to name_max characters are written there, + terminated with a zero unless the length is greater than name_max. If + comment is not Z_NULL, then up to comm_max characters are written there, + terminated with a zero unless the length is greater than comm_max. When + any of extra, name, or comment are not Z_NULL and the respective field is + not present in the header, then that field is set to Z_NULL to signal its + absence. This allows the use of deflateSetHeader() with the returned + structure to duplicate the header. However if those fields are set to + allocated memory, then the application will need to save those pointers + elsewhere so that they can be eventually freed. + + If inflateGetHeader is not used, then the header information is simply + discarded. The header is always checked for validity, including the header + CRC if present. inflateReset() will reset the process to discard the header + information. The application would need to call inflateGetHeader() again to + retrieve the header from the next gzip stream. + + inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source + stream state was inconsistent. +*/ + +/* +ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, unsigned char FAR *window)); Initialize the internal stream state for decompression using inflateBack() @@ -744,7 +877,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_stream FAR *strm, int windowBits, typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); -ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm, +ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, in_func in, void FAR *in_desc, out_func out, void FAR *out_desc)); /* @@ -813,7 +946,7 @@ ZEXTERN int ZEXPORT inflateBack OF((z_stream FAR *strm, that inflateBack() cannot return Z_OK. */ -ZEXTERN int ZEXPORT inflateBackEnd OF((z_stream FAR *strm)); +ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); /* All memory allocated by inflateBackInit() is freed. @@ -1087,6 +1220,12 @@ ZEXTERN int ZEXPORT gzeof OF((gzFile file)); input stream, otherwise zero. */ +ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); +/* + Returns 1 if file is being read directly without decompression, otherwise + zero. +*/ + ZEXTERN int ZEXPORT gzclose OF((gzFile file)); /* Flushes all pending output if necessary, closes the compressed file @@ -1119,7 +1258,6 @@ ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); */ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); - /* Update a running Adler-32 checksum with the bytes buf[0..len-1] and return the updated checksum. If buf is NULL, this function returns @@ -1135,12 +1273,21 @@ ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); if (adler != original_adler) error(); */ +ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, + z_off_t len2)); +/* + Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 + and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for + each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of + seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. +*/ + ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* - Update a running crc with the bytes buf[0..len-1] and return the updated - crc. If buf is NULL, this function returns the required initial value - for the crc. Pre- and post-conditioning (one's complement) is performed - within this function so it shouldn't be done by the application. + Update a running CRC-32 with the bytes buf[0..len-1] and return the + updated CRC-32. If buf is NULL, this function returns the required initial + value for the for the crc. Pre- and post-conditioning (one's complement) is + performed within this function so it shouldn't be done by the application. Usage example: uLong crc = crc32(0L, Z_NULL, 0); @@ -1151,6 +1298,16 @@ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); if (crc != original_crc) error(); */ +ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); + +/* + Combine two CRC-32 check values into one. For two sequences of bytes, + seq1 and seq2 with lengths len1 and len2, CRC-32 check values were + calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 + check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and + len2. +*/ + /* various hacks, don't look :) */ @@ -1167,7 +1324,7 @@ ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, int stream_size)); ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits, +ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, unsigned char FAR *window, const char *version, int stream_size)); @@ -1189,7 +1346,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits, struct internal_state {int dummy;}; /* hack for buggy compilers */ #endif -ZEXTERN const char * ZEXPORT zError OF((int err)); +ZEXTERN const char * ZEXPORT zError OF((int)); ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z)); ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); diff --git a/compiler/amxxpc/zlib.lib b/compiler/amxxpc/zlib.lib index d5348407..6a5dc759 100755 Binary files a/compiler/amxxpc/zlib.lib and b/compiler/amxxpc/zlib.lib differ diff --git a/compiler/libpc300/Makefile b/compiler/libpc300/Makefile index 3a9793b9..ba92f425 100755 --- a/compiler/libpc300/Makefile +++ b/compiler/libpc300/Makefile @@ -26,7 +26,7 @@ else CFLAGS += -DPAWN_CELL_SIZE=32 endif -CFLAGS += -DLINUX -DNDEBUG -fPIC -DHAVE_STDINT_H -DENABLE_BINRELOC -DNO_MAIN -DPAWNC_DLL -static-libgcc +CFLAGS += -DLINUX -DNDEBUG -DHAVE_STDINT_H -DENABLE_BINRELOC -DNO_MAIN -DPAWNC_DLL -static-libgcc CFLAGS += $(OPT_FLAGS) OBJ_LINUX := $(OBJECTS:%.c=$(BIN_DIR)/%.o) diff --git a/compiler/libpc300/amx.h b/compiler/libpc300/amx.h index eb9bc06b..46485a1e 100755 --- a/compiler/libpc300/amx.h +++ b/compiler/libpc300/amx.h @@ -21,6 +21,15 @@ * Version: $Id$ */ +#ifdef _MSC_VER + // MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated + #if _MSC_VER >= 1400 + #define access _access + #define chdir _chdir + #define stricmp _stricmp + #endif +#endif + #if defined FREEBSD && !defined __FreeBSD__ #define __FreeBSD__ #endif diff --git a/compiler/libpc300/libpc300.sln b/compiler/libpc300/libpc300.sln index 7f2a48ab..84cf97bf 100755 --- a/compiler/libpc300/libpc300.sln +++ b/compiler/libpc300/libpc300.sln @@ -1,33 +1,26 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpc300", "libpc300.vcproj", "{19B72687-080B-437A-917A-12AEB0031635}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Debug32 = Debug32 - Debug64 = Debug64 - Release = Release - Release32 = Release32 - Release64 = Release64 + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug32|Win32 = Debug32|Win32 + Debug64|Win32 = Debug64|Win32 + Release32|Win32 = Release32|Win32 + Release64|Win32 = Release64|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {19B72687-080B-437A-917A-12AEB0031635}.Debug.ActiveCfg = Release|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Debug.Build.0 = Release|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Debug32.ActiveCfg = Debug32|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Debug32.Build.0 = Debug32|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Debug64.ActiveCfg = Debug64|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Debug64.Build.0 = Debug64|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Release.ActiveCfg = Release|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Release.Build.0 = Release|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Release32.ActiveCfg = Release32|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Release32.Build.0 = Release32|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Release64.ActiveCfg = Release64|Win32 - {19B72687-080B-437A-917A-12AEB0031635}.Release64.Build.0 = Release64|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {19B72687-080B-437A-917A-12AEB0031635}.Debug32|Win32.ActiveCfg = Debug32|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Debug32|Win32.Build.0 = Debug32|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Debug64|Win32.ActiveCfg = Debug64|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Debug64|Win32.Build.0 = Debug64|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Release32|Win32.ActiveCfg = Release32|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Release32|Win32.Build.0 = Release32|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Release64|Win32.ActiveCfg = Release64|Win32 + {19B72687-080B-437A-917A-12AEB0031635}.Release64|Win32.Build.0 = Release64|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/compiler/libpc300/libpc300.vcproj b/compiler/libpc300/libpc300.vcproj index c0e3da7a..1808e603 100755 --- a/compiler/libpc300/libpc300.vcproj +++ b/compiler/libpc300/libpc300.vcproj @@ -1,303 +1,335 @@ + Keyword="Win32Proj" + > + Name="Win32" + /> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="false" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="false" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -306,79 +338,103 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\libpawnc.c" + > + RelativePath=".\memfile.c" + > + RelativePath=".\sc1.c" + > + RelativePath=".\sc2.c" + > + RelativePath=".\sc3.c" + > + RelativePath=".\sc4.c" + > + RelativePath=".\sc5.c" + > + RelativePath=".\sc6.c" + > + RelativePath=".\sc7.c" + > + RelativePath=".\scexpand.c" + > + RelativePath=".\sci18n.c" + > + RelativePath=".\sclist.c" + > + RelativePath=".\scmemfil.c" + > + RelativePath=".\scstate.c" + > + RelativePath=".\scvars.c" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\amx.h" + > + RelativePath=".\memfile.h" + > + RelativePath=".\sc.h" + > + UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" + > + RelativePath=".\libpawnc.rc" + > + RelativePath=".\sc5.scp" + > + RelativePath=".\sc7.scp" + > diff --git a/compiler/libpc300/memfile.c b/compiler/libpc300/memfile.c index 2047f710..73fd405f 100644 --- a/compiler/libpc300/memfile.c +++ b/compiler/libpc300/memfile.c @@ -21,7 +21,7 @@ memfile_t *memfile_creat(const char *name, size_t init) pmf = (memfile_t *)malloc(sizeof(memfile_t)); memcpy(pmf, &mf, sizeof(memfile_t)); - pmf->name = strdup(name); + pmf->name = _strdup(name); return pmf; } diff --git a/compiler/libpc300/memfile.h b/compiler/libpc300/memfile.h index f5222a9e..8593e4b6 100644 --- a/compiler/libpc300/memfile.h +++ b/compiler/libpc300/memfile.h @@ -1,6 +1,14 @@ #ifndef _INCLUDE_MEMFILE_H #define _INCLUDE_MEMFILE_H +#ifdef _MSC_VER + // MSVC8 - replace POSIX functions with ISO C++ conformant ones as they are deprecated + #if _MSC_VER >= 1400 + #define strdup _strdup + #pragma warning(disable : 4996) + #endif +#endif + #include typedef struct memfile_s diff --git a/compiler/scasm/Makefile.pl b/compiler/scasm/Makefile.pl index 5769905c..5395eb12 100755 --- a/compiler/scasm/Makefile.pl +++ b/compiler/scasm/Makefile.pl @@ -133,7 +133,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.cpp/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "$gccf $cflags -Dstrcmpi=strcasecmp $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; @@ -155,7 +155,7 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++) $ofile = $file; $ofile =~ s/\.c/\.o/; $ofile = "$outdir/$ofile"; - $gcc = "cc $cflags -Dstrcmpi=strcasecmp -fPIC $inc -c $file -o $ofile"; + $gcc = "cc $cflags -Dstrcmpi=strcasecmp $inc -c $file -o $ofile"; if (-e $ofile) { $file_time = (stat($file))[9]; diff --git a/compiler/scasm/assembler.sln b/compiler/scasm/assembler.sln new file mode 100644 index 00000000..b58279c9 --- /dev/null +++ b/compiler/scasm/assembler.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "assembler", "assembler.vcproj", "{FFFC86BE-94E7-458A-A61B-4D0F3B45658B}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FFFC86BE-94E7-458A-A61B-4D0F3B45658B}.Debug|Win32.ActiveCfg = Debug|Win32 + {FFFC86BE-94E7-458A-A61B-4D0F3B45658B}.Debug|Win32.Build.0 = Debug|Win32 + {FFFC86BE-94E7-458A-A61B-4D0F3B45658B}.Release|Win32.ActiveCfg = Release|Win32 + {FFFC86BE-94E7-458A-A61B-4D0F3B45658B}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/compiler/scasm/assembler.vcproj b/compiler/scasm/assembler.vcproj index d3a9b4e6..ddc00798 100755 --- a/compiler/scasm/assembler.vcproj +++ b/compiler/scasm/assembler.vcproj @@ -1,108 +1,175 @@ + RootNamespace="assembler" + Keyword="Win32Proj" + > + Name="Win32" + /> + + + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" + CharacterSet="2" + > + + + + + + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> @@ -111,89 +178,117 @@ + UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" + > + RelativePath=".\amx_compiler.cpp" + > + RelativePath=".\amx_data.cpp" + > + RelativePath=".\amx_define.cpp" + > + RelativePath=".\amx_error.cpp" + > + RelativePath=".\amx_label.cpp" + > + RelativePath=".\amx_macro.cpp" + > + RelativePath=".\amx_natives.cpp" + > + RelativePath=".\amx_parser.cpp" + > + RelativePath=".\amx_proc.cpp" + > + RelativePath=".\amx_symbol.cpp" + > + RelativePath=".\amxasm.cpp" + > + RelativePath=".\cexpr.cpp" + > + UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" + > + RelativePath=".\amx.h" + > + RelativePath=".\amx_compiler.h" + > + RelativePath=".\amx_data.h" + > + RelativePath=".\amx_define.h" + > + RelativePath=".\amx_error.h" + > + RelativePath=".\amx_label.h" + > + RelativePath=".\amx_macro.h" + > + RelativePath=".\amx_nametable.h" + > + RelativePath=".\amx_natives.h" + > + RelativePath=".\amx_parser.h" + > + RelativePath=".\amx_proc.h" + > + RelativePath=".\amx_symbol.h" + > + RelativePath=".\amxasm.h" + > + RelativePath=".\cexpr.h" + > diff --git a/dlls/cstrike/cstrike/Makefile b/dlls/cstrike/cstrike/Makefile index e9dfcb9c..d5aa48db 100755 --- a/dlls/cstrike/cstrike/Makefile +++ b/dlls/cstrike/cstrike/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc -m32 +CFLAGS += -DNDEBUG -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -fno-rtti -static-libgcc -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/cstrike/cstrike/cstrike.h b/dlls/cstrike/cstrike/cstrike.h index 87b3495c..d855f070 100755 --- a/dlls/cstrike/cstrike/cstrike.h +++ b/dlls/cstrike/cstrike/cstrike.h @@ -34,9 +34,9 @@ // cstrike MODULE TO DO HERE: http://www.amxmodx.org/forums/viewtopic.php?t=45 // This implementation uses Vexd's way (lightly modified) of setting models on players. +#include "amxxmodule.h" #include #include -#include "amxxmodule.h" #include "CstrikePlayer.h" #define GETINFOKEYBUFFER (*g_engfuncs.pfnGetInfoKeyBuffer) diff --git a/dlls/cstrike/cstrike/msvc7/cstrike.sln b/dlls/cstrike/cstrike/msvc7/cstrike.sln deleted file mode 100644 index c486de5e..00000000 --- a/dlls/cstrike/cstrike/msvc7/cstrike.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cstrike", "cstrike.vcproj", "{AB148B92-4F47-42E6-8268-AB4E588EC6A2}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug.ActiveCfg = Debug|Win32 - {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Debug.Build.0 = Debug|Win32 - {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release.ActiveCfg = Release|Win32 - {AB148B92-4F47-42E6-8268-AB4E588EC6A2}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/cstrike/cstrike/msvc7/cstrike.vcproj b/dlls/cstrike/cstrike/msvc7/cstrike.vcproj deleted file mode 100755 index 090d6915..00000000 --- a/dlls/cstrike/cstrike/msvc7/cstrike.vcproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/cstrike/cstrike/msvc8/cstrike.vcproj b/dlls/cstrike/cstrike/msvc8/cstrike.vcproj index 0ae4b42a..09fd084b 100644 --- a/dlls/cstrike/cstrike/msvc8/cstrike.vcproj +++ b/dlls/cstrike/cstrike/msvc8/cstrike.vcproj @@ -48,7 +48,7 @@ + + diff --git a/dlls/cstrike/csx/Makefile b/dlls/cstrike/csx/Makefile index 34d46412..8f45f2ca 100755 --- a/dlls/cstrike/csx/Makefile +++ b/dlls/cstrike/csx/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 +CFLAGS += -DNDEBUG -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/cstrike/csx/WinCSX/msvc7/WinCSX.vcproj b/dlls/cstrike/csx/WinCSX/msvc7/WinCSX.vcproj deleted file mode 100755 index 094b12be..00000000 --- a/dlls/cstrike/csx/WinCSX/msvc7/WinCSX.vcproj +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/cstrike/csx/msvc7/csx.sln b/dlls/cstrike/csx/msvc7/csx.sln deleted file mode 100755 index 14dbaa34..00000000 --- a/dlls/cstrike/csx/msvc7/csx.sln +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csx", "csx.vcproj", "{1DC4A99A-F23F-4AAE-881C-79D157C91155}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinCSX", "..\WinCSX\msvc7\WinCSX.vcproj", "{39A1E5DD-81A1-441D-B99A-E50A01DB05D7}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.ActiveCfg = Debug|Win32 - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Debug.Build.0 = Debug|Win32 - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.ActiveCfg = Release|Win32 - {1DC4A99A-F23F-4AAE-881C-79D157C91155}.Release.Build.0 = Release|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug.ActiveCfg = Debug|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Debug.Build.0 = Debug|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release.ActiveCfg = Release|Win32 - {39A1E5DD-81A1-441D-B99A-E50A01DB05D7}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/cstrike/csx/msvc7/csx.vcproj b/dlls/cstrike/csx/msvc7/csx.vcproj deleted file mode 100755 index 93a0b835..00000000 --- a/dlls/cstrike/csx/msvc7/csx.vcproj +++ /dev/null @@ -1,214 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/cstrike/csx/msvc8/csx.vcproj b/dlls/cstrike/csx/msvc8/csx.vcproj index e7d96e02..5c37ea73 100644 --- a/dlls/cstrike/csx/msvc8/csx.vcproj +++ b/dlls/cstrike/csx/msvc8/csx.vcproj @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\;..\sdk" + AdditionalIncludeDirectories="..\;..\sdk;"$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls";"$(HLSDK)\pm_shared"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;csx_EXPORTS;JIT" StringPooling="true" RuntimeLibrary="0" @@ -145,7 +145,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/dod/dodfun/msvc8/dodfun.vcproj b/dlls/dod/dodfun/msvc8/dodfun.vcproj index 9f93acfd..cd2990b3 100644 --- a/dlls/dod/dodfun/msvc8/dodfun.vcproj +++ b/dlls/dod/dodfun/msvc8/dodfun.vcproj @@ -48,7 +48,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\;..\sdk" + AdditionalIncludeDirectories="..\;..\sdk;"$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls";"$(HLSDK)\pm_shared"" PreprocessorDefinitions="dodfun_EXPORTS" StringPooling="true" RuntimeLibrary="0" @@ -144,7 +144,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/dod/dodx/msvc8/dodx.vcproj b/dlls/dod/dodx/msvc8/dodx.vcproj index 49248d32..e9c72f19 100644 --- a/dlls/dod/dodx/msvc8/dodx.vcproj +++ b/dlls/dod/dodx/msvc8/dodx.vcproj @@ -48,7 +48,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\;..\sdk" + AdditionalIncludeDirectories="..\;..\sdk;"$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls";"$(HLSDK)\pm_shared"" PreprocessorDefinitions="dodx_EXPORTS" StringPooling="true" RuntimeLibrary="0" @@ -144,7 +144,7 @@ #include #include #include -#include "amxxmodule.h" #include "CVector.h" #include "CString.h" #include diff --git a/dlls/engine/msvc7/engine.sln b/dlls/engine/msvc7/engine.sln deleted file mode 100644 index d086dcdb..00000000 --- a/dlls/engine/msvc7/engine.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine.vcproj", "{B3F4467B-6148-4EBF-B897-168D81CF8D9B}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Debug.ActiveCfg = Debug|Win32 - {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Debug.Build.0 = Debug|Win32 - {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Release.ActiveCfg = Release|Win32 - {B3F4467B-6148-4EBF-B897-168D81CF8D9B}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/engine/msvc7/engine.vcproj b/dlls/engine/msvc7/engine.vcproj deleted file mode 100755 index 843834cb..00000000 --- a/dlls/engine/msvc7/engine.vcproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/engine/msvc8/engine.vcproj b/dlls/engine/msvc8/engine.vcproj index c5aa24a4..2405fbf9 100644 --- a/dlls/engine/msvc8/engine.vcproj +++ b/dlls/engine/msvc8/engine.vcproj @@ -41,7 +41,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/fakemeta/msvc8/fakemeta.vcproj b/dlls/fakemeta/msvc8/fakemeta.vcproj index 5edf2398..b1a0122e 100644 --- a/dlls/fakemeta/msvc8/fakemeta.vcproj +++ b/dlls/fakemeta/msvc8/fakemeta.vcproj @@ -41,7 +41,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/fun/msvc8/fun.vcproj b/dlls/fun/msvc8/fun.vcproj index a5da5104..f0309c96 100644 --- a/dlls/fun/msvc8/fun.vcproj +++ b/dlls/fun/msvc8/fun.vcproj @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="..\;..\sdk" + AdditionalIncludeDirectories="..\;..\sdk;"$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls";"$(HLSDK)\pm_shared"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FUN_EXPORTS" StringPooling="true" RuntimeLibrary="0" @@ -144,7 +144,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/hamsandwich/DataHandler.cpp b/dlls/hamsandwich/DataHandler.cpp index 33d5dab5..bf1ce495 100644 --- a/dlls/hamsandwich/DataHandler.cpp +++ b/dlls/hamsandwich/DataHandler.cpp @@ -26,7 +26,7 @@ * you do not wish to do so, delete this exception statement from your * version. */ -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include "CVector.h" #include "CString.h" diff --git a/dlls/hamsandwich/Makefile b/dlls/hamsandwich/Makefile index 60e7ae6c..85585cd2 100644 --- a/dlls/hamsandwich/Makefile +++ b/dlls/hamsandwich/Makefile @@ -40,7 +40,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -fPIC -Wall -Wno-non-virtual-dtor -fno-exceptions -DHAVE_STDINT_H -fno-rtti -Werror -m32 +CFLAGS += -Wall -Wno-non-virtual-dtor -fno-exceptions -DHAVE_STDINT_H -fno-rtti -Werror -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/hamsandwich/amxx_api.cpp b/dlls/hamsandwich/amxx_api.cpp index c4b78560..6b95f465 100644 --- a/dlls/hamsandwich/amxx_api.cpp +++ b/dlls/hamsandwich/amxx_api.cpp @@ -27,8 +27,8 @@ * version. */ +#include "amxxmodule.h" #include -#include "sdk/amxxmodule.h" #include "NEW_Util.h" #include "CVector.h" diff --git a/dlls/hamsandwich/call_funcs.cpp b/dlls/hamsandwich/call_funcs.cpp index 371af1d7..2f2a9d2b 100644 --- a/dlls/hamsandwich/call_funcs.cpp +++ b/dlls/hamsandwich/call_funcs.cpp @@ -26,7 +26,7 @@ * you do not wish to do so, delete this exception statement from your * version. */ -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include "offsets.h" #include "ham_utils.h" diff --git a/dlls/hamsandwich/config_parser.cpp b/dlls/hamsandwich/config_parser.cpp index f413d907..0520c1dd 100644 --- a/dlls/hamsandwich/config_parser.cpp +++ b/dlls/hamsandwich/config_parser.cpp @@ -26,7 +26,7 @@ * you do not wish to do so, delete this exception statement from your * version. */ -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include "ham_const.h" #include "hooklist.h" diff --git a/dlls/hamsandwich/forward.h b/dlls/hamsandwich/forward.h index c524c6e1..d57a41dd 100644 --- a/dlls/hamsandwich/forward.h +++ b/dlls/hamsandwich/forward.h @@ -26,7 +26,7 @@ * you do not wish to do so, delete this exception statement from your * version. */ -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #ifndef FORWARD_H #define FORWARD_H diff --git a/dlls/hamsandwich/ham_utils.h b/dlls/hamsandwich/ham_utils.h index 39a99f52..90be9579 100644 --- a/dlls/hamsandwich/ham_utils.h +++ b/dlls/hamsandwich/ham_utils.h @@ -30,7 +30,7 @@ #ifndef HAM_UTILS_H #define HAM_UTILS_H -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include "offsets.h" #include "NEW_Util.h" diff --git a/dlls/hamsandwich/hook_callbacks.cpp b/dlls/hamsandwich/hook_callbacks.cpp index 332d5cff..6ad484a9 100644 --- a/dlls/hamsandwich/hook_callbacks.cpp +++ b/dlls/hamsandwich/hook_callbacks.cpp @@ -32,7 +32,7 @@ #include #include -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" diff --git a/dlls/hamsandwich/hook_create.cpp b/dlls/hamsandwich/hook_create.cpp index 76684dbf..5afbb630 100644 --- a/dlls/hamsandwich/hook_create.cpp +++ b/dlls/hamsandwich/hook_create.cpp @@ -26,7 +26,7 @@ * you do not wish to do so, delete this exception statement from your * version. */ -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" int Create_Void_Void(AMX *amx, const char *func) { diff --git a/dlls/hamsandwich/hook_native.cpp b/dlls/hamsandwich/hook_native.cpp index c970eda5..0b6aeb1e 100644 --- a/dlls/hamsandwich/hook_native.cpp +++ b/dlls/hamsandwich/hook_native.cpp @@ -32,7 +32,7 @@ #include #include -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include "CVector.h" diff --git a/dlls/hamsandwich/msvc7/hamsandwich.sln b/dlls/hamsandwich/msvc7/hamsandwich.sln deleted file mode 100644 index bb204821..00000000 --- a/dlls/hamsandwich/msvc7/hamsandwich.sln +++ /dev/null @@ -1,37 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hamsandwich", "hamsandwich.vcproj", "{5E393C37-22F2-4CA2-9022-6400DC582447}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {5E393C37-22F2-4CA2-9022-6400DC582447}.Debug.ActiveCfg = Debug|Win32 - {5E393C37-22F2-4CA2-9022-6400DC582447}.Debug.Build.0 = Debug|Win32 - {5E393C37-22F2-4CA2-9022-6400DC582447}.Release.ActiveCfg = Release|Win32 - {5E393C37-22F2-4CA2-9022-6400DC582447}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.ActiveCfg = Release|Win32 - {5E393C37-22F2-4CA2-9022-6400DC582447}.Debug|Win32.Build.0 = Release|Win32 - {5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.ActiveCfg = Release|Win32 - {5E393C37-22F2-4CA2-9022-6400DC582447}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/dlls/hamsandwich/msvc7/hamsandwich.vcproj b/dlls/hamsandwich/msvc7/hamsandwich.vcproj deleted file mode 100644 index 058e61b3..00000000 --- a/dlls/hamsandwich/msvc7/hamsandwich.vcproj +++ /dev/null @@ -1,217 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/hamsandwich/msvc8/hamsandwich.vcproj b/dlls/hamsandwich/msvc8/hamsandwich.vcproj index 41b2ea86..c44fd53c 100644 --- a/dlls/hamsandwich/msvc8/hamsandwich.vcproj +++ b/dlls/hamsandwich/msvc8/hamsandwich.vcproj @@ -41,7 +41,7 @@ - - - - + + + + + + + + + + + + + + - - @@ -279,35 +295,53 @@ RelativePath="..\pdata.cpp" > + + + + - - - + + + + + + + + + - - - - - - - - - + + + + + diff --git a/dlls/hamsandwich/pdata.cpp b/dlls/hamsandwich/pdata.cpp index ad58a46c..199f86d7 100644 --- a/dlls/hamsandwich/pdata.cpp +++ b/dlls/hamsandwich/pdata.cpp @@ -26,7 +26,7 @@ * you do not wish to do so, delete this exception statement from your * version. */ -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include "offsets.h" #include "NEW_Util.h" #include "ham_utils.h" diff --git a/dlls/hamsandwich/CString.h b/dlls/hamsandwich/sdk/CString.h similarity index 100% rename from dlls/hamsandwich/CString.h rename to dlls/hamsandwich/sdk/CString.h diff --git a/dlls/hamsandwich/CVector.h b/dlls/hamsandwich/sdk/CVector.h similarity index 100% rename from dlls/hamsandwich/CVector.h rename to dlls/hamsandwich/sdk/CVector.h diff --git a/dlls/hamsandwich/sh_stack.h b/dlls/hamsandwich/sdk/sh_stack.h similarity index 100% rename from dlls/hamsandwich/sh_stack.h rename to dlls/hamsandwich/sdk/sh_stack.h diff --git a/dlls/hamsandwich/srvcmd.cpp b/dlls/hamsandwich/srvcmd.cpp index bac995bd..9e4fc3f7 100644 --- a/dlls/hamsandwich/srvcmd.cpp +++ b/dlls/hamsandwich/srvcmd.cpp @@ -27,7 +27,7 @@ * version. */ -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include diff --git a/dlls/hamsandwich/typetocell.h b/dlls/hamsandwich/typetocell.h index 0c376b20..b8afe3c8 100644 --- a/dlls/hamsandwich/typetocell.h +++ b/dlls/hamsandwich/typetocell.h @@ -30,7 +30,7 @@ #define TYPETOCELL_H #include -#include "sdk/amxxmodule.h" +#include "amxxmodule.h" #include "CVector.h" diff --git a/dlls/mysqlx/Makefile b/dlls/mysqlx/Makefile index c56c4b9e..d7e8650c 100755 --- a/dlls/mysqlx/Makefile +++ b/dlls/mysqlx/Makefile @@ -40,7 +40,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -Dstricmp=strcasecmp -fno-rtti -static-libgcc +CFLAGS += -DNDEBUG -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -Dstricmp=strcasecmp -fno-rtti -static-libgcc CFLAGS += -DSM_DEFAULT_THREADER -m32 ifeq "$(AMD64)" "true" diff --git a/dlls/mysqlx/msvc7/mysqlx.sln b/dlls/mysqlx/msvc7/mysqlx.sln deleted file mode 100644 index 192949fb..00000000 --- a/dlls/mysqlx/msvc7/mysqlx.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlx", "mysqlx.vcproj", "{7877D370-E48E-4A85-8EE4-131863A5B09F}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {7877D370-E48E-4A85-8EE4-131863A5B09F}.Debug.ActiveCfg = Debug|Win32 - {7877D370-E48E-4A85-8EE4-131863A5B09F}.Debug.Build.0 = Debug|Win32 - {7877D370-E48E-4A85-8EE4-131863A5B09F}.Release.ActiveCfg = Release|Win32 - {7877D370-E48E-4A85-8EE4-131863A5B09F}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/mysqlx/msvc7/mysqlx.vcproj b/dlls/mysqlx/msvc7/mysqlx.vcproj deleted file mode 100644 index 8d2e2361..00000000 --- a/dlls/mysqlx/msvc7/mysqlx.vcproj +++ /dev/null @@ -1,274 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/mysqlx/msvc8/mysqlx.vcproj b/dlls/mysqlx/msvc8/mysqlx.vcproj index fb0b44c9..071699ad 100644 --- a/dlls/mysqlx/msvc8/mysqlx.vcproj +++ b/dlls/mysqlx/msvc8/mysqlx.vcproj @@ -41,7 +41,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/ns/msvc8/ns.vcproj b/dlls/ns/msvc8/ns.vcproj index a28c667e..1719a060 100644 --- a/dlls/ns/msvc8/ns.vcproj +++ b/dlls/ns/msvc8/ns.vcproj @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="z:\metamod\metamod;z:\hlsdk\common;z:\hlsdk\engine;z:\hlsdk\dlls;z:\hlsdk\pm_shared" + AdditionalIncludeDirectories="..\;..\sdk;"$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls";"$(HLSDK)\pm_shared"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS" StringPooling="true" RuntimeLibrary="0" @@ -143,7 +143,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/regex/Makefile b/dlls/regex/Makefile index 18e0fcda..4e2ad17e 100755 --- a/dlls/regex/Makefile +++ b/dlls/regex/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 +CFLAGS += -DNDEBUG -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/regex/msvc8/regex.vcproj b/dlls/regex/msvc8/regex.vcproj index 5be2ebd1..4c7a310f 100644 --- a/dlls/regex/msvc8/regex.vcproj +++ b/dlls/regex/msvc8/regex.vcproj @@ -66,7 +66,7 @@ AdditionalDependencies="..\lib_win\pcre.lib" OutputFile="$(OutDir)/regex_amxx.dll" LinkIncremental="2" - IgnoreDefaultLibraryNames="LIBCMT" + IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT" GenerateDebugInformation="true" ProgramDatabaseFile="$(OutDir)/regex.pdb" SubSystem="2" @@ -146,7 +146,7 @@ AdditionalDependencies="..\lib_win\pcre.lib" OutputFile="$(OutDir)/regex_amxx.dll" LinkIncremental="1" - IgnoreDefaultLibraryNames="LIBCMT" + IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMTD" GenerateDebugInformation="true" SubSystem="2" OptimizeReferences="2" diff --git a/dlls/sockets/Makefile b/dlls/sockets/Makefile index ac913633..7783a6c2 100755 --- a/dlls/sockets/Makefile +++ b/dlls/sockets/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 +CFLAGS += -DNDEBUG -Wall -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/sockets/msvc7/sockets.sln b/dlls/sockets/msvc7/sockets.sln deleted file mode 100644 index b3a39997..00000000 --- a/dlls/sockets/msvc7/sockets.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sockets", "sockets.vcproj", "{F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Debug.ActiveCfg = Debug|Win32 - {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Debug.Build.0 = Debug|Win32 - {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Release.ActiveCfg = Release|Win32 - {F15BBA96-2F66-44BB-9DDF-D91AE6D33AE7}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/sockets/msvc7/sockets.vcproj b/dlls/sockets/msvc7/sockets.vcproj deleted file mode 100755 index 772077a4..00000000 --- a/dlls/sockets/msvc7/sockets.vcproj +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/sqlite/Makefile b/dlls/sqlite/Makefile index 11317643..c3b47136 100755 --- a/dlls/sqlite/Makefile +++ b/dlls/sqlite/Makefile @@ -53,9 +53,9 @@ ifeq "$(GCC_VERSION)" "4" CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden endif -CPPFLAGS += -DNDEBUG -fPIC -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -fno-rtti +CPPFLAGS += -DNDEBUG -Wno-deprecated -fno-exceptions -DHAVE_STDINT_H -fno-rtti CPPFLAGS += -DSM_DEFAULT_THREADER -Dstricmp=strcasecmp -CFLAGS += -DNDEBUG -fPIC -DHAVE_STDINT_H -DSM_DEFAULT_THREADER -Dstricmp=strcasecmp +CFLAGS += -DNDEBUG -DHAVE_STDINT_H -DSM_DEFAULT_THREADER -Dstricmp=strcasecmp ifeq "$(AMD64)" "true" BINARY = $(NAME)_$(BIN_SUFFIX_64) diff --git a/dlls/sqlite/msvc7/sqlite.sln b/dlls/sqlite/msvc7/sqlite.sln deleted file mode 100755 index 5f13882e..00000000 --- a/dlls/sqlite/msvc7/sqlite.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "sqlite.vcproj", "{4FDFD106-7163-44F0-85C4-9FAFECD14973}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Debug.ActiveCfg = Debug|Win32 - {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Debug.Build.0 = Debug|Win32 - {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Release.ActiveCfg = Release|Win32 - {4FDFD106-7163-44F0-85C4-9FAFECD14973}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/sqlite/msvc7/sqlite.vcproj b/dlls/sqlite/msvc7/sqlite.vcproj deleted file mode 100644 index 815fad45..00000000 --- a/dlls/sqlite/msvc7/sqlite.vcproj +++ /dev/null @@ -1,443 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/sqlite/msvc8/sqlite.vcproj b/dlls/sqlite/msvc8/sqlite.vcproj index 05ecee0a..ddb562c8 100644 --- a/dlls/sqlite/msvc8/sqlite.vcproj +++ b/dlls/sqlite/msvc8/sqlite.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/D "NO_TCL"" Optimization="0" - AdditionalIncludeDirectories="..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread" + AdditionalIncludeDirectories="..\;..\sdk;"..\sqlite-source";..\sqlitepp;..\thread;"$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -129,7 +129,7 @@ Optimization="2" InlineFunctionExpansion="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\;..\sdk;..\sqlite-source;..\sqlitepp;..\thread" + AdditionalIncludeDirectories="..\;..\sdk;"..\sqlite-source";..\sqlitepp;..\thread;"$(METAMOD)";"$(HLSDK)\common";"$(HLSDK)\engine";"$(HLSDK)\dlls"" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;sqlite_EXPORTS;SM_DEFAULT_THREADER" StringPooling="true" RuntimeLibrary="0" diff --git a/dlls/tfcx/Makefile b/dlls/tfcx/Makefile index 9c657f76..80492871 100755 --- a/dlls/tfcx/Makefile +++ b/dlls/tfcx/Makefile @@ -34,7 +34,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -m32 +CFLAGS += -DNDEBUG -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/tfcx/msvc7/tfcx.sln b/dlls/tfcx/msvc7/tfcx.sln deleted file mode 100644 index 0b460173..00000000 --- a/dlls/tfcx/msvc7/tfcx.sln +++ /dev/null @@ -1,23 +0,0 @@ -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/tfcx/msvc7/tfcx.vcproj b/dlls/tfcx/msvc7/tfcx.vcproj deleted file mode 100755 index 5f9913ef..00000000 --- a/dlls/tfcx/msvc7/tfcx.vcproj +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/tfcx/msvc8/tfcx.vcproj b/dlls/tfcx/msvc8/tfcx.vcproj index aeeadac2..1182ba27 100644 --- a/dlls/tfcx/msvc8/tfcx.vcproj +++ b/dlls/tfcx/msvc8/tfcx.vcproj @@ -48,7 +48,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/ts/tsx/Makefile b/dlls/ts/tsx/Makefile index 1ec2859a..a0d93c84 100755 --- a/dlls/ts/tsx/Makefile +++ b/dlls/ts/tsx/Makefile @@ -35,7 +35,7 @@ else CFLAGS = $(OPT_FLAGS) endif -CFLAGS += -DNDEBUG -fPIC -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 +CFLAGS += -DNDEBUG -Wall -Wno-non-virtual-dtor -Werror -fno-exceptions -DHAVE_STDINT_H -static-libgcc -fno-rtti -m32 BINARY = $(NAME)_$(BIN_SUFFIX) CFLAGS += -DPAWN_CELL_SIZE=32 -DJIT -DASM32 diff --git a/dlls/ts/tsx/msvc7/tsx.sln b/dlls/ts/tsx/msvc7/tsx.sln deleted file mode 100644 index ca6764bd..00000000 --- a/dlls/ts/tsx/msvc7/tsx.sln +++ /dev/null @@ -1,23 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tsx", "tsx.vcproj", "{7F18E00C-6271-4CAB-B18A-746BE3EC68E7}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectDependencies) = postSolution - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Debug.ActiveCfg = Debug|Win32 - {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Debug.Build.0 = Debug|Win32 - {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Release.ActiveCfg = Release|Win32 - {7F18E00C-6271-4CAB-B18A-746BE3EC68E7}.Release.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/dlls/ts/tsx/msvc7/tsx.vcproj b/dlls/ts/tsx/msvc7/tsx.vcproj deleted file mode 100755 index e60ccffc..00000000 --- a/dlls/ts/tsx/msvc7/tsx.vcproj +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dlls/ts/tsx/msvc8/tsx.vcproj b/dlls/ts/tsx/msvc8/tsx.vcproj index ab53a364..f1b14564 100644 --- a/dlls/ts/tsx/msvc8/tsx.vcproj +++ b/dlls/ts/tsx/msvc8/tsx.vcproj @@ -48,7 +48,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/installer/AMXXRelease/AMXXRelease.exe b/installer/AMXXRelease/AMXXRelease.exe deleted file mode 100755 index 7e9d4780..00000000 Binary files a/installer/AMXXRelease/AMXXRelease.exe and /dev/null differ diff --git a/installer/AMXXRelease/AMXXRelease.sln b/installer/AMXXRelease/AMXXRelease.sln deleted file mode 100755 index c118282f..00000000 --- a/installer/AMXXRelease/AMXXRelease.sln +++ /dev/null @@ -1,21 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AMXXRelease", "AMXXRelease.csproj", "{60FE591C-FDC8-44B4-9AC1-CE3617450E31}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release - EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Debug.ActiveCfg = Debug|.NET - {60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Debug.Build.0 = Debug|.NET - {60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Release.ActiveCfg = Release|.NET - {60FE591C-FDC8-44B4-9AC1-CE3617450E31}.Release.Build.0 = Release|.NET - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution - EndGlobalSection -EndGlobal diff --git a/installer/AMXXRelease/AssemblyInfo.cs b/installer/AMXXRelease/AssemblyInfo.cs deleted file mode 100755 index f08ed68a..00000000 --- a/installer/AMXXRelease/AssemblyInfo.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -[assembly: AssemblyTitle("AMXXRelease")] -[assembly: AssemblyDescription("Build scripts for AMX Mod X")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("AMX Mod X")] -[assembly: AssemblyProduct("AMXXRelease")] -[assembly: AssemblyCopyright("(C)Copyright 2004-2005 AMX Mod X Development Team")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.0.*")] - -// -// In order to sign your assembly you must specify a key to use. Refer to the -// Microsoft .NET Framework documentation for more information on assembly signing. -// -// Use the attributes below to control which key is used for signing. -// -// Notes: -// (*) If no key is specified, the assembly is not signed. -// (*) KeyName refers to a key that has been installed in the Crypto Service -// Provider (CSP) on your machine. KeyFile refers to a file which contains -// a key. -// (*) If the KeyFile and the KeyName values are both specified, the -// following processing occurs: -// (1) If the KeyName can be found in the CSP, that key is used. -// (2) If the KeyName does not exist and the KeyFile does exist, the key -// in the KeyFile is installed into the CSP and used. -// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. -// When specifying the KeyFile, the location of the KeyFile should be -// relative to the project output directory which is -// %Project Directory%\obj\. For example, if your KeyFile is -// located in the project directory, you would specify the AssemblyKeyFile -// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] -// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework -// documentation for more information on this. -// -[assembly: AssemblyDelaySign(false)] -[assembly: AssemblyKeyFile("")] -[assembly: AssemblyKeyName("")] diff --git a/installer/AMXXRelease/win32.info b/installer/AMXXRelease/win32.info deleted file mode 100755 index 2fd57987..00000000 --- a/installer/AMXXRelease/win32.info +++ /dev/null @@ -1,6 +0,0 @@ -compress = C:\WINDOWS\zip.exe -source = c:\temp\amxmodx -makeopts = -output = c:\temp\done -devenv = C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\devenv.com -release = amxmodx-1.8.0 diff --git a/installer/AMXXRelease/ABuilder.cs b/installer/builder/ABuilder.cs similarity index 100% rename from installer/AMXXRelease/ABuilder.cs rename to installer/builder/ABuilder.cs diff --git a/installer/AMXXRelease/AMod.cs b/installer/builder/AMod.cs similarity index 98% rename from installer/AMXXRelease/AMod.cs rename to installer/builder/AMod.cs index 8fac4657..8b9be6b6 100755 --- a/installer/AMXXRelease/AMod.cs +++ b/installer/builder/AMod.cs @@ -34,7 +34,7 @@ public Module() { build = "Release"; outdir = "modules"; - bindir = "msvc7"; + bindir = "msvc8"; } public Module(string name) @@ -42,7 +42,7 @@ public Module(string name) build = "Release"; outdir = "modules"; sourcedir = "dlls\\" + name; - bindir = "msvc7"; + bindir = "msvc8"; projname = name + "_amxx"; vcproj = name; } diff --git a/installer/AMXXRelease/App.ico b/installer/builder/App.ico similarity index 100% rename from installer/AMXXRelease/App.ico rename to installer/builder/App.ico diff --git a/installer/AMXXRelease/Build.cs b/installer/builder/Build.cs similarity index 100% rename from installer/AMXXRelease/Build.cs rename to installer/builder/Build.cs diff --git a/installer/AMXXRelease/Config.cs b/installer/builder/Config.cs similarity index 100% rename from installer/AMXXRelease/Config.cs rename to installer/builder/Config.cs diff --git a/installer/AMXXRelease/CoreMod.cs b/installer/builder/CoreMod.cs similarity index 100% rename from installer/AMXXRelease/CoreMod.cs rename to installer/builder/CoreMod.cs diff --git a/installer/AMXXRelease/LinuxBuilder.cs b/installer/builder/LinuxBuilder.cs similarity index 100% rename from installer/AMXXRelease/LinuxBuilder.cs rename to installer/builder/LinuxBuilder.cs diff --git a/installer/AMXXRelease/Main.cs b/installer/builder/Main.cs similarity index 100% rename from installer/AMXXRelease/Main.cs rename to installer/builder/Main.cs diff --git a/installer/AMXXRelease/Makefile b/installer/builder/Makefile similarity index 62% rename from installer/AMXXRelease/Makefile rename to installer/builder/Makefile index 204bba39..ecb96116 100755 --- a/installer/AMXXRelease/Makefile +++ b/installer/builder/Makefile @@ -1,12 +1,11 @@ -#(C)2004-2005 AMX Mod X Development Team +#(C)2004-2008 AMX Mod X Development Team # Makefile written by David "BAILOPAN" Anderson ### EDIT BELOW FOR OTHER PROJECTS ### -CS = /usr/mono/bin/mcs -NAME = amxxrelease -BINARY = $(NAME).bin -OUTPATH = . +CS = gmcs +NAME = builder +BINARY = $(NAME).exe OBJECTS = Main.cs Config.cs ABuilder.cs AMod.cs Build.cs Win32Builder.cs LinuxBuilder.cs \ CoreMod.cs ModDoD.cs ModEsf.cs ModCstrike.cs ModTFC.cs \ @@ -15,8 +14,7 @@ OBJECTS = Main.cs Config.cs ABuilder.cs AMod.cs Build.cs Win32Builder.cs LinuxBu default: all all: $(OBJECTS) - $(CS) $(OBJECTS) -o $(OUTPATH)/$(BINARY) + $(CS) $(OBJECTS) -out:$(BINARY) clean: - rm -rf amxxrelease - + rm -rf $(BINARY) diff --git a/installer/AMXXRelease/ModCstrike.cs b/installer/builder/ModCstrike.cs similarity index 94% rename from installer/AMXXRelease/ModCstrike.cs rename to installer/builder/ModCstrike.cs index 5560e87e..625ccf5d 100755 --- a/installer/AMXXRelease/ModCstrike.cs +++ b/installer/builder/ModCstrike.cs @@ -37,7 +37,7 @@ public override sealed bool CopyExtraFiles(ABuilder ab, string basedir, string s if ((int)System.Environment.OSVersion.Platform == 128) { } else { - File.Copy(source + "\\dlls\\cstrike\\csx\\WinCSX\\msvc7\\Release\\WinCSX.exe", + File.Copy(source + "\\dlls\\cstrike\\csx\\WinCSX\\msvc8\\Release\\WinCSX.exe", basedir + "\\data\\WinCSX.exe", true); } diff --git a/installer/AMXXRelease/ModDoD.cs b/installer/builder/ModDoD.cs similarity index 100% rename from installer/AMXXRelease/ModDoD.cs rename to installer/builder/ModDoD.cs diff --git a/installer/AMXXRelease/ModEsf.cs b/installer/builder/ModEsf.cs similarity index 100% rename from installer/AMXXRelease/ModEsf.cs rename to installer/builder/ModEsf.cs diff --git a/installer/AMXXRelease/ModNs.cs b/installer/builder/ModNs.cs similarity index 100% rename from installer/AMXXRelease/ModNs.cs rename to installer/builder/ModNs.cs diff --git a/installer/AMXXRelease/ModTFC.cs b/installer/builder/ModTFC.cs similarity index 100% rename from installer/AMXXRelease/ModTFC.cs rename to installer/builder/ModTFC.cs diff --git a/installer/AMXXRelease/ModTs.cs b/installer/builder/ModTs.cs similarity index 100% rename from installer/AMXXRelease/ModTs.cs rename to installer/builder/ModTs.cs diff --git a/installer/builder/Properties/AssemblyInfo.cs b/installer/builder/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..1f2a7388 --- /dev/null +++ b/installer/builder/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("AMXX Build Tool")] +[assembly: AssemblyDescription("Build scripts for AMX Mod X")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("AlliedModders, LLC")] +[assembly: AssemblyProduct("AMXX Build Tool")] +[assembly: AssemblyCopyright("(C)Copyright 2004-2008 AlliedModders, LLC")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("83e54c68-616e-4392-9a12-7ff5a27865d4")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/installer/AMXXRelease/Win32Builder.cs b/installer/builder/Win32Builder.cs similarity index 100% rename from installer/AMXXRelease/Win32Builder.cs rename to installer/builder/Win32Builder.cs diff --git a/installer/builder/builder.csproj b/installer/builder/builder.csproj new file mode 100755 index 00000000..e3403b2c --- /dev/null +++ b/installer/builder/builder.csproj @@ -0,0 +1,60 @@ + + + Debug + AnyCPU + 8.0.50727 + 2.0 + {93EF9F0C-2C25-428C-A13F-B7B7E46B22BB} + Exe + Properties + builder + builder + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/installer/builder/builder.exe b/installer/builder/builder.exe new file mode 100755 index 00000000..817d6847 Binary files /dev/null and b/installer/builder/builder.exe differ diff --git a/installer/builder/builder.sln b/installer/builder/builder.sln new file mode 100755 index 00000000..9d627d21 --- /dev/null +++ b/installer/builder/builder.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "builder", "builder.csproj", "{93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {93EF9F0C-2C25-428C-A13F-B7B7E46B22BB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/installer/AMXXRelease/linux32.info b/installer/builder/linux32.info similarity index 83% rename from installer/AMXXRelease/linux32.info rename to installer/builder/linux32.info index 68585416..40ec99ef 100755 --- a/installer/AMXXRelease/linux32.info +++ b/installer/builder/linux32.info @@ -3,4 +3,4 @@ source = /home/users/dvander/amxx makeopts = output = /home/users/dvander/done devenv = /usr/bin/make -release = amxmodx-1.76c +release = amxmodx-1.8.1 diff --git a/installer/AMXXRelease/linux64.info b/installer/builder/linux64.info similarity index 83% rename from installer/AMXXRelease/linux64.info rename to installer/builder/linux64.info index 936babc6..dcfa5f53 100755 --- a/installer/AMXXRelease/linux64.info +++ b/installer/builder/linux64.info @@ -3,4 +3,4 @@ source = /home/dvander/code/amxx makeopts = amd64 output = /home/dvander/done devenv = /usr/bin/make -release = amxmodx-1.76 +release = amxmodx-1.8.1 diff --git a/installer/builder/win32.info b/installer/builder/win32.info new file mode 100755 index 00000000..294930bf --- /dev/null +++ b/installer/builder/win32.info @@ -0,0 +1,6 @@ +compress = C:\WINDOWS\zip.exe +source = c:\temp\amxmodx +makeopts = +output = c:\temp\done +devenv = C:\Program Files\Microsoft Visual Studio 8\Common7\IDE\devenv.com +release = amxmodx-1.8.1 diff --git a/plugins/amxxpc.exe b/plugins/amxxpc.exe index 558f14b3..c175b545 100755 Binary files a/plugins/amxxpc.exe and b/plugins/amxxpc.exe differ diff --git a/plugins/amxxpc32.dll b/plugins/amxxpc32.dll index fea41b58..70d8de61 100755 Binary files a/plugins/amxxpc32.dll and b/plugins/amxxpc32.dll differ diff --git a/plugins/amxxpc64.dll b/plugins/amxxpc64.dll index 974ac365..4f668192 100755 Binary files a/plugins/amxxpc64.dll and b/plugins/amxxpc64.dll differ diff --git a/plugins/sasm.exe b/plugins/sasm.exe index 6ce48619..09c0940d 100755 Binary files a/plugins/sasm.exe and b/plugins/sasm.exe differ