diff --git a/core/msvc8/sourcemod_mm.vcproj b/core/msvc8/sourcemod_mm.vcproj index d79f849e..913534d3 100644 --- a/core/msvc8/sourcemod_mm.vcproj +++ b/core/msvc8/sourcemod_mm.vcproj @@ -614,6 +614,14 @@ + + + + diff --git a/core/sm_version.h b/core/sm_version.h index 774818cf..ca273dd3 100644 --- a/core/sm_version.h +++ b/core/sm_version.h @@ -25,5 +25,6 @@ #define SOURCEMOD_V_REV 0 #define SOURCEMOD_VERSION "1.0.0." SVN_REVISION_STRING +#define SOURCEMOD_FILEVERS 1,0,0,0 #endif //_INCLUDE_SOURCEMOD_VERSION_H_ diff --git a/core/svn_version.h b/core/svn_version.h index 74cf8f5b..95cf2d96 100644 --- a/core/svn_version.h +++ b/core/svn_version.h @@ -3,7 +3,9 @@ #ifndef _INCLUDE_SVN_VERSION_H_ #define _INCLUDE_SVN_VERSION_H_ -#define SVN_REVISION 0 -#define SVN_REVISION_STRING "$trunk" +#define SVN_REVISION 390 +#define SVN_REVISION_STRING "390" +#define SVN_FILE_VERSION 1,0,0,390 #endif //_INCLUDE_SVN_VERSION_H_ + diff --git a/core/version.rc b/core/version.rc new file mode 100644 index 00000000..5e6c1bfe --- /dev/null +++ b/core/version.rc @@ -0,0 +1,104 @@ +// Microsoft Visual C++ generated resource script. +// +//#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +#include "sm_version.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION SVN_FILE_VERSION + PRODUCTVERSION SVN_FILE_VERSION + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "Comments", "SourceMod" + VALUE "FileDescription", "SourceMod Core" + VALUE "FileVersion", SVN_REVISION_STRING + VALUE "InternalName", "sourcemod" + VALUE "LegalCopyright", "Copyright (c) 2004-2007, AlliedModders LLC" + VALUE "OriginalFilename", "sourcemod_mm.dll" + VALUE "ProductName", "SourceMod" + VALUE "ProductVersion", SOURCEMOD_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/sourcepawn/compiler/libpawnc.rc b/sourcepawn/compiler/libpawnc.rc index df89015a..d486738d 100644 --- a/sourcepawn/compiler/libpawnc.rc +++ b/sourcepawn/compiler/libpawnc.rc @@ -4,7 +4,7 @@ #else # include #endif -#include "svnrev.h" +#include "svn_version.h" AppIcon ICON "pawn.ico" @@ -13,10 +13,10 @@ AppIcon ICON "pawn.ico" * All strings MUST have an explicit \0. See the Windows SDK documentation * for details on version information and the VERSIONINFO structure. */ -#define VERSION SMC_VERSION -#define REVISION SMC_REVISION -#define BUILD SMC_BUILD -#define VERSIONSTR SMC_VERSTRING +#define VERSION 1 +#define REVISION 0 +#define BUILD SVN_REVISION +#define VERSIONSTR SVN_REVISION_STRING #define VERSIONNAME "smcomp.exe\0" #define VERSIONDESCRIPTION "SourcePawn Compiler\0" #define VERSIONPRODUCTNAME "smcomp\0" diff --git a/sourcepawn/compiler/msvc8/spcomp.vcproj b/sourcepawn/compiler/msvc8/spcomp.vcproj index bc6dacc2..c18d258b 100644 --- a/sourcepawn/compiler/msvc8/spcomp.vcproj +++ b/sourcepawn/compiler/msvc8/spcomp.vcproj @@ -309,7 +309,7 @@ > diff --git a/sourcepawn/compiler/pawncc.c b/sourcepawn/compiler/pawncc.c index b5dc1bc3..8a35a40f 100644 --- a/sourcepawn/compiler/pawncc.c +++ b/sourcepawn/compiler/pawncc.c @@ -260,31 +260,6 @@ int main(int argc, char *argv[]) spfw_next_section(spf); } - if (sections[FS_Libraries]) - { - sp_file_libraries_t *libtbl; - AMX_FUNCSTUBNT *stub; - unsigned char *stubptr; - uint32_t libraries = sections[FS_Libraries]; - - libtbl = (sp_file_libraries_t *)malloc(sizeof(sp_file_libraries_t) * libraries); - stubptr = (unsigned char *)hdr + hdr->libraries; - - for (i=0; inameofs - (hdr->nametable + sizeof(uint16_t)); - - stubptr += hdr->defsize; - } - if (libraries) - { - sfwrite(libtbl, sizeof(sp_file_libraries_t), libraries, spf); - } - free(libtbl); - spfw_next_section(spf); - } - if (sections[FS_Nametable]) { unsigned char *base; diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c index 646a8161..d605a8c8 100644 --- a/sourcepawn/compiler/sc1.c +++ b/sourcepawn/compiler/sc1.c @@ -65,9 +65,9 @@ #include "lstring.h" #include "sc.h" -#include "svnrev.h" +#include "svn_version.h" #include "sctracker.h" -#define VERSION_STR "3.2." SVN_REVSTR +#define VERSION_STR "3.2.3636" #define VERSION_INT 0x0302 int pc_functag = 0; @@ -1179,7 +1179,7 @@ static void setconfig(char *root) static void setcaption(void) { - pc_printf("SourcePawn Compiler " SMC_VERSTRING "\n"); + pc_printf("SourcePawn Compiler 1.0.0." SVN_REVISION_STRING "\n"); pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2006 AlliedModders, LLC\n\n"); } diff --git a/sourcepawn/compiler/svnrev.h b/sourcepawn/compiler/svnrev.h deleted file mode 100644 index 3843eb5b..00000000 --- a/sourcepawn/compiler/svnrev.h +++ /dev/null @@ -1,9 +0,0 @@ -#define SMC_VERSION 1 -#define SMC_REVISION 0 -#define SMC_BUILD 1 -#define SMC_VERSTRING "1.0.1.3636" - -#define SVN_REV 3636 -#define SVN_REVSTR "3636" -#define SVN_REVDATE "2006-08-14" -#define SVN_REVSTAMP 20060814L diff --git a/sourcepawn/jit/x86/jit_x86.cpp b/sourcepawn/jit/x86/jit_x86.cpp index 0e561626..35da47a2 100644 --- a/sourcepawn/jit/x86/jit_x86.cpp +++ b/sourcepawn/jit/x86/jit_x86.cpp @@ -17,6 +17,7 @@ #include "jit_x86.h" #include "opcode_helpers.h" #include "x86_macros.h" +#include "jit_version.h" #if defined USE_UNGEN_OPCODES #include "ungen_opcodes.h" @@ -2331,7 +2332,7 @@ unsigned int JITX86::FunctionCount(const sp_context_t *ctx) const char *JITX86::GetVersionString() { - return "1.0.0.0"; + return JIT_VERSION; } const char *JITX86::GetCPUOptimizations() diff --git a/sourcepawn/jit/x86/msvc8/jit-x86.vcproj b/sourcepawn/jit/x86/msvc8/jit-x86.vcproj index 5d64372f..a9d943e3 100644 --- a/sourcepawn/jit/x86/msvc8/jit-x86.vcproj +++ b/sourcepawn/jit/x86/msvc8/jit-x86.vcproj @@ -208,6 +208,10 @@ RelativePath="..\dll_exports.h" > + + @@ -216,6 +220,10 @@ RelativePath="..\opcode_helpers.h" > + + @@ -238,6 +246,10 @@ RelativePath="..\ungen_opcode_switch.inc" > + +