From 3594c1123841bef400954c0948a43d65a5440a78 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Mon, 8 Dec 2014 01:39:10 +0100 Subject: [PATCH 1/7] Update versioning --- AMBuildScript | 85 ++++++++++++++----------------- public/amxmodx_version.h | 42 +++++++++++++++ support/Versioning | 2 +- support/generate_headers.py | 44 +++++++++------- support/versionlib/AMBuilder | 15 ++++++ support/versionlib/versionlib.cpp | 8 +++ support/versionlib/versionlib.h | 24 +++++++++ 7 files changed, 154 insertions(+), 66 deletions(-) create mode 100644 public/amxmodx_version.h create mode 100644 support/versionlib/AMBuilder create mode 100644 support/versionlib/versionlib.cpp create mode 100644 support/versionlib/versionlib.h diff --git a/AMBuildScript b/AMBuildScript index 7b88dbdf..51cfe01d 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -14,6 +14,7 @@ class AMXXConfig(object): self.hlsdk_path = None self.mysql_path = None self.generated_headers = [] + self.versionlib = None self.csx_app = None self.stdcxx_path = None @@ -24,7 +25,6 @@ class AMXXConfig(object): def detectProductVersion(self): builder.AddConfigureFile('product.version') - builder.AddConfigureFile('.git/HEAD') # For OS X dylib versioning import re @@ -243,11 +243,15 @@ class AMXXConfig(object): cfg.defines += [ 'AMX_NOPROPLIST', 'PAWN_CELL_SIZE=32', + 'AMXMODX_BUILD', + 'AMXX_USE_VERSIONLIB', ] if self.use_auto_versioning(): - cfg.defines += ['AMBUILD'] + cfg.defines += ['AMXX_GENERATED_BUILD'] cfg.includes += [os.path.join(builder.buildPath, 'includes')] + cfg.includes += [os.path.join(builder.sourcePath, 'support', 'versionlib')] + cfg.includes += [os.path.join(builder.sourcePath, 'public')] cfg.includes += [os.path.join(builder.sourcePath, 'public', 'sdk')] cfg.includes += [os.path.join(builder.sourcePath, 'public', 'amtl')] @@ -258,9 +262,10 @@ class AMXXConfig(object): # Low-level compiler and binary construction. # - def MMCompiler(self, context): - compiler = context.compiler.clone() + def ConfigureForModule(self, context, compiler): compiler.cxxincludes += [ + os.path.join(context.currentSourcePath), + os.path.join(context.currentSourcePath, 'sdk'), os.path.join(self.metamod_path, 'metamod'), os.path.join(self.hlsdk_path, 'common'), os.path.join(self.hlsdk_path, 'dlls'), @@ -271,49 +276,22 @@ class AMXXConfig(object): ] return compiler - def LibraryBuilder(self, context, compiler, name): - binary = compiler.Library(name) - binary.compiler.cxxincludes += [os.path.join(context.currentSourcePath)] + def AddVersioning(self, binary): if builder.target_platform == 'windows': binary.compiler.rcdefines += [ 'BINARY_NAME="{0}"'.format(binary.outputFile), 'RC_COMPILE', ] if self.use_auto_versioning(): - binary.compiler.rcdefines += ['AMBUILD'] + binary.compiler.rcdefines += ['AMXX_GENERATED_BUILD'] elif builder.target_platform == 'mac': binary.compiler.postlink += [ '-compatibility_version', '1.0.0', '-current_version', self.productVersion ] - if self.use_auto_versioning(): - binary.compiler.rcdefines += ['AMBUILD'] - - binary.compiler.sourcedeps += AMXX.generated_headers - return binary - - def ModuleBuilder(self, context, compiler, name): - compiler.cxxincludes += [ - os.path.join(context.currentSourcePath, 'sdk'), - ] - - if builder.target_platform == 'mac' or builder.target_platform == 'windows': - name = name + '_amxx' - elif builder.target_platform == 'linux': - name = name + '_amxx_i386' - - return self.LibraryBuilder(context, compiler, name) - - def ProgramBuilder(self, context, compiler, name): - binary = compiler.Program(name) - binary.compiler.cxxincludes += [os.path.join(context.currentSourcePath)] - if builder.target_platform == 'windows': - binary.compiler.rcdefines += [ - 'BINARY_NAME="{0}"'.format(binary.outputFile), - 'AMBUILD', - 'RC_COMPILE', - ] - binary.compiler.sourcedeps += AMXX.generated_headers + if self.use_auto_versioning(): + binary.compiler.linkflags += [self.versionlib] + binary.compiler.sourcedeps += AMXX.generated_headers return binary # @@ -322,30 +300,39 @@ class AMXXConfig(object): # def Library(self, context, name): - compiler = context.compiler.clone() - return self.LibraryBuilder(context, compiler, name) + binary = context.compiler.Library(name) + return self.AddVersioning(binary) def MetaPlugin(self, context, name): - compiler = self.MMCompiler(context) - + binary = context.compiler.Library(name) + self.ConfigureForModule(context, binary.compiler) + if builder.target_platform == 'mac' or builder.target_platform == 'windows': name = name + '_mm' elif builder.target_platform == 'linux': name = name + '_mm_i386' - return self.LibraryBuilder(context, compiler, name) + return self.AddVersioning(binary) def Module(self, context, name): - compiler = context.compiler.clone() - return self.ModuleBuilder(context, compiler, name) + binary = context.compiler.Library(name) + self.ConfigureForModule(context, binary.compiler) + return self.AddVersioning(binary) def MetaModule(self, context, name): - compiler = self.MMCompiler(context) - return self.ModuleBuilder(context, compiler, name) + binary = context.compiler.Library(name) + self.ConfigureForModule(context, binary.compiler) + + if builder.target_platform == 'mac' or builder.target_platform == 'windows': + name = name + '_amxx' + elif builder.target_platform == 'linux': + name = name + '_amxx_i386' + + return self.AddVersioning(binary) def Program(self, context, name): - compiler = context.compiler.clone() - return self.ProgramBuilder(context, compiler, name) + binary = context.compiler.Program(name) + return self.AddVersioning(binary) AMXX = AMXXConfig() AMXX.detectProductVersion() @@ -359,6 +346,10 @@ if AMXX.use_auto_versioning(): 'support/Versioning', { 'AMXX': AMXX } ) + AMXX.versionlib = builder.RunScript( + 'support/versionlib/AMBuilder', + { 'AMXX': AMXX } + ) builder.RunBuildScripts( [ diff --git a/public/amxmodx_version.h b/public/amxmodx_version.h new file mode 100644 index 00000000..d8fde6a4 --- /dev/null +++ b/public/amxmodx_version.h @@ -0,0 +1,42 @@ +#ifndef _INCLUDE_AMXX_VERSION_INFORMATION_H_ +#define _INCLUDE_AMXX_VERSION_INFORMATION_H_ + +/** + * @file Contains AMX Mod X version information. + * @brief This file will redirect to an autogenerated version if being compiled via + * the build scripts. + */ + +#if defined AMXX_GENERATED_BUILD + #if defined RC_COMPILE + #undef AMXX_USE_VERSIONLIB + #endif + #if defined AMXX_USE_VERSIONLIB + #include + #else + #include + #endif +#else + #define AMXX_BUILD_TAG "manual" + #define AMXX_BUILD_LOCAL_REV "0" + #define AMXX_BUILD_CSET "0" + #define AMXX_BUILD_MAJOR "1" + #define AMXX_BUILD_MINOR "8" + #define AMXX_BUILD_RELEASE "3" + + #define AMXX_BUILD_UNIQUEID AMXX_BUILD_LOCAL_REV ":" AMXX_BUILD_CSET + + #define AMXX_VERSION_STRING AMXX_BUILD_MAJOR "." AMXX_BUILD_MINOR "." AMXX_BUILD_RELEASE "-" AMXX_BUILD_TAG + #define AMXX_VERSION_FILE 1,8,3,0 +#endif + +#define AMXX_BUILD_TIMESTAMP __DATE__ " " __TIME__ + +#if !defined(AMXX_GENERATED_BUILD) || !defined(AMXX_USE_VERSIONLIB) + #define AMXX_VERSION AMXX_VERSION_STRING + #define AMXX_BUILD_ID AMXX_BUILD_UNIQUEID + #define AMXX_BUILD_TIME AMXX_BUILD_TIMESTAMP +#endif + +#endif /* _INCLUDE_AMXX_VERSION_INFORMATION_H_ */ + diff --git a/support/Versioning b/support/Versioning index 26a7249b..c78d9d6a 100644 --- a/support/Versioning +++ b/support/Versioning @@ -13,7 +13,7 @@ argv = [ os.path.join(builder.buildPath, 'includes'), ] outputs = [ - os.path.join(builder.buildFolder, 'includes', 'amxmodx_version.h'), + os.path.join(builder.buildFolder, 'includes', 'amxmodx_version_auto.h'), os.path.join(builder.buildFolder, 'includes', 'amxmodx_version.inc'), ] diff --git a/support/generate_headers.py b/support/generate_headers.py index c0c5b448..b4ff5cf5 100644 --- a/support/generate_headers.py +++ b/support/generate_headers.py @@ -60,29 +60,27 @@ def output_version_headers(): if tag != "": fullstring += "-{0}".format(tag) if tag == "dev": - fullstring += "+{0}".format(shorthash) + fullstring += "+{0}".format(count) - with open(os.path.join(OutputFolder, 'amxmodx_version.h'), 'w') as fp: + with open(os.path.join(OutputFolder, 'amxmodx_version_auto.h'), 'w') as fp: fp.write(""" #ifndef _AMXMODX_AUTO_VERSION_INFORMATION_H_ #define _AMXMODX_AUTO_VERSION_INFORMATION_H_ -#define SVN_VERSION_STRING "{fullstring}" -#define SVN_VERSION_DWORD {major}, {minor}, {release}, 0 -#define SVN_VERSION_PRODUCT "{product}" -#define SVN_VERSION SVN_VERSION_STRING -#define SVN_BUILD_ID "{count}:{longhash}" +#define AMXX_BUILD_TAG \"{0}\" +#define AMXX_BUILD_CSET \"{1}\" +#define AMXX_BUILD_MAJOR \"{2}\" +#define AMXX_BUILD_MINOR \"{3}\" +#define AMXX_BUILD_RELEASE \"{4}\" +#define AMXX_BUILD_LOCAL_REV \"{6}\" + +#define AMXX_BUILD_UNIQUEID "{6}:" AMXX_BUILD_CSET + +#define AMXX_VERSION_STRING \"{5}\" +#define AMXX_VERSION_FILE {2},{3},{4},0 #endif // _AMXMODX_AUTO_VERSION_INFORMATION_H_ - """.format( - fullstring = fullstring, - major = major, - minor = minor, - release = release, - product = product, - count = count, - longhash = longhash - )) + """.format(tag, shorthash, major, minor, release, fullstring, count)) version_num = int(major) * 100 + int(minor) * 10 + int(release) with open(os.path.join(OutputFolder, 'amxmodx_version.inc'), 'w') as fp: @@ -92,13 +90,23 @@ def output_version_headers(): #endif #define _amxmodx_version_included -#define AMXX_VERSION {major}.{minor}{release} -#define AMXX_VERSION_NUM {version_num} +#define AMXX_VERSION_TAG \"{tag}\" +#define AMXX_VERSION_CSET \"{shorthash}\" +#define AMXX_VERSION_MAJOR \"{major}\" +#define AMXX_VERSION_MINOR \"{minor}\" +#define AMXX_VERSION_RELEASE \"{release}\" +#define AMXX_VERSION_LOCAL_REV \"{count}\" +#define AMXX_VERSION {major}.{minor}{release} +#define AMXX_VERSION_NUM {version_num} + stock const AMXX_VERSION_STR[] = "{fullstring}"; """.format( + tag = tag, + shorthash = shorthash, major = major, minor = minor, release = release, + count = count, version_num = version_num, fullstring = fullstring )) diff --git a/support/versionlib/AMBuilder b/support/versionlib/AMBuilder new file mode 100644 index 00000000..97449fe1 --- /dev/null +++ b/support/versionlib/AMBuilder @@ -0,0 +1,15 @@ +# vim: sts=2 ts=8 sw=2 tw=99 et ft=python: +import os + +lib = builder.compiler.StaticLibrary('version') +lib.compiler.includes += [ + os.path.join(builder.sourcePath, 'public'), +] +lib.compiler.defines.remove('AMXX_USE_VERSIONLIB') +lib.compiler.sourcedeps += AMXX.generated_headers +lib.sources += [ + 'versionlib.cpp' +] +task = builder.Add(lib) + +rvalue = task.binary diff --git a/support/versionlib/versionlib.cpp b/support/versionlib/versionlib.cpp new file mode 100644 index 00000000..2f190f34 --- /dev/null +++ b/support/versionlib/versionlib.cpp @@ -0,0 +1,8 @@ + +#include +#include + +const char *AMXX_LOCAL_REV = AMXX_BUILD_LOCAL_REV; +const char *AMXX_SHA = AMXX_BUILD_CSET; +const char *AMXX_VERSION = AMXX_VERSION_STRING; +const char *AMXX_BUILD_TIME = __DATE__ " " __TIME__; diff --git a/support/versionlib/versionlib.h b/support/versionlib/versionlib.h new file mode 100644 index 00000000..eb66a9aa --- /dev/null +++ b/support/versionlib/versionlib.h @@ -0,0 +1,24 @@ +#ifndef _INCLUDE_AMXX_VERSIONLIB_H_ +#define _INCLUDE_AMXX_VERSIONLIB_H_ + +#if !defined(AMXX_USE_VERSIONLIB) +// These get defined in amxmodx_version.h since +// versionlib does not use versionlib. + #undef AMXX_LOCAL_REV + #undef AMXX_CSET + #undef AMXX_VERSION + #undef AMXX_BUILD_TIME +#endif + +#ifdef __cplusplus + #define EXTERN_C extern "C" +#else + #define EXTERN_C extern +#endif + +EXTERN_C const char *AMXX_LOCAL_REV; +EXTERN_C const char *AMXX_SHA; +EXTERN_C const char *AMXX_VERSION; +EXTERN_C const char *AMXX_BUILD_TIME; + +#endif // _INCLUDE_AMXX_VERSIONLIB_H_ From 7c96c30be8601e26c2202e8ca8920a7238983c73 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Mon, 8 Dec 2014 01:41:52 +0100 Subject: [PATCH 2/7] Replace old SVN_* defines by the new ones --- amxmodx/amxmodx.cpp | 2 +- amxmodx/amxxlog.cpp | 2 +- amxmodx/meta_api.cpp | 6 +++--- amxmodx/srvcmd.cpp | 7 +++++-- compiler/amxxpc/amxxpc.cpp | 2 +- compiler/amxxpc/amxxpc.h | 2 -- compiler/amxxpc/amxxpc1.rc | 43 +++++++++++++++++++++++++++++++++++--- 7 files changed, 51 insertions(+), 13 deletions(-) diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp index 60f5daf5..10c8ab9c 100755 --- a/amxmodx/amxmodx.cpp +++ b/amxmodx/amxmodx.cpp @@ -814,7 +814,7 @@ static cell AMX_NATIVE_CALL is_user_alive(AMX *amx, cell *params) /* 1 param */ static cell AMX_NATIVE_CALL get_amxx_verstring(AMX *amx, cell *params) /* 2 params */ { - return set_amxstring(amx, params[1], SVN_VERSION_STRING, params[2]); + return set_amxstring(amx, params[1], AMXX_VERSION, params[2]); } static cell AMX_NATIVE_CALL get_user_frags(AMX *amx, cell *params) /* 1 param */ diff --git a/amxmodx/amxxlog.cpp b/amxmodx/amxxlog.cpp index 193e4685..73554352 100755 --- a/amxmodx/amxxlog.cpp +++ b/amxmodx/amxxlog.cpp @@ -101,7 +101,7 @@ void CLog::CreateNewFile() ALERT(at_logged, "[AMXX] Unexpected fatal logging error. AMXX Logging disabled.\n"); SET_LOCALINFO("amxx_logging", "0"); } else { - fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, SVN_VERSION_STRING); + fprintf(fp, "AMX Mod X log file started (file \"%s\") (version \"%s\")\n", name, AMXX_VERSION); fclose(fp); } } diff --git a/amxmodx/meta_api.cpp b/amxmodx/meta_api.cpp index 3a751018..2fe486fa 100755 --- a/amxmodx/meta_api.cpp +++ b/amxmodx/meta_api.cpp @@ -36,7 +36,7 @@ plugin_info_t Plugin_info = { META_INTERFACE_VERSION, // ifvers "AMX Mod X", // name - SVN_VERSION_STRING, // version + AMXX_VERSION, // version __DATE__, // date "AMX Mod X Dev Team", // author "http://www.amxmodx.org", // url @@ -450,7 +450,7 @@ int C_Spawn(edict_t *pent) int loaded = countModules(CountModules_Running); // Call after attachModules so all modules don't have pending stat // Set some info about amx version and modules - CVAR_SET_STRING(init_amxmodx_version.name, SVN_VERSION_STRING); + CVAR_SET_STRING(init_amxmodx_version.name, AMXX_VERSION); char buffer[32]; sprintf(buffer, "%d", loaded); CVAR_SET_STRING(init_amxmodx_modules.name, buffer); @@ -1458,7 +1458,7 @@ C_DLLEXPORT int Meta_Attach(PLUG_LOADTIME now, META_FUNCTIONS *pFunctionTable, m // ###### Print short GPL print_srvconsole("\n AMX Mod X version %s Copyright (c) 2004-2014 AMX Mod X Development Team \n" - " AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", SVN_VERSION_STRING); + " AMX Mod X comes with ABSOLUTELY NO WARRANTY; for details type `amxx gpl'.\n", AMXX_VERSION); print_srvconsole(" This is free software and you are welcome to redistribute it under \n" " certain conditions; type 'amxx gpl' for details.\n \n"); diff --git a/amxmodx/srvcmd.cpp b/amxmodx/srvcmd.cpp index ab3b8e76..91e264ef 100755 --- a/amxmodx/srvcmd.cpp +++ b/amxmodx/srvcmd.cpp @@ -180,8 +180,11 @@ void amx_command() print_srvconsole("\tFelix \"SniperBeamer\" Geyer, Jonny \"Got His Gun\" Bergstrom\n"); print_srvconsole("\tLukasz \"SidLuke\" Wlasinski, Christian \"Basic-Master\" Hammacher\n"); print_srvconsole("\tBorja \"faluco\" Ferrer, Scott \"DS\" Ehlert\n"); - print_srvconsole("Compiled: %s\n", __DATE__ ", " __TIME__); - print_srvconsole("Build ID: %s\n", SVN_BUILD_ID); + print_srvconsole("Compiled: %s\n", AMXX_BUILD_TIME); +#if defined(AMXX_GENERATED_BUILD) + print_srvconsole("Built from: https://github.com/alliedmodders/amxmodx/commit/%s", AMXX_SHA); + print_srvconsole("Build ID: %s:%s", AMXX_LOCAL_REV, AMXX_SHA); +#endif #if defined JIT && !defined ASM32 print_srvconsole("Core mode: JIT Only\n"); #elif !defined JIT && defined ASM32 diff --git a/compiler/amxxpc/amxxpc.cpp b/compiler/amxxpc/amxxpc.cpp index 8b6b59b2..3c6833de 100755 --- a/compiler/amxxpc/amxxpc.cpp +++ b/compiler/amxxpc/amxxpc.cpp @@ -82,7 +82,7 @@ int main(int argc, char **argv) exit(0); } - pc_printf("AMX Mod X Compiler %s\n", SVN_VERSION); + pc_printf("AMX Mod X Compiler %s\n", AMXX_VERSION); pc_printf("Copyright (c) 1997-2006 ITB CompuPhase\n"); pc_printf("Copyright (c) 2004-2013 AMX Mod X Team\n\n"); diff --git a/compiler/amxxpc/amxxpc.h b/compiler/amxxpc/amxxpc.h index 38488ea6..9ed2d982 100755 --- a/compiler/amxxpc/amxxpc.h +++ b/compiler/amxxpc/amxxpc.h @@ -10,9 +10,7 @@ #ifndef _AMXXSC_INCLUDE_H #define _AMXXSC_INCLUDE_H -#ifndef SVN_VERSION #include -#endif #define MAGIC_HEADER2 0x414D5858 #define MAGIC_VERSION 0x0300 diff --git a/compiler/amxxpc/amxxpc1.rc b/compiler/amxxpc/amxxpc1.rc index 11ea11c3..99606b60 100755 --- a/compiler/amxxpc/amxxpc1.rc +++ b/compiler/amxxpc/amxxpc1.rc @@ -1,13 +1,12 @@ // Microsoft Visual C++ generated resource script. // -#include "resource1.h" - #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// // // Generated from the TEXTINCLUDE 2 resource. // -#include "windows.h" +#include +#include ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -21,6 +20,44 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMXXPC" + VALUE "FileDescription", "AMXXPC" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", "amxxpc" + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", "amxxpc.exe" + VALUE "ProductName", "AMXXPC" + VALUE "ProductVersion", AMXX_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // From 291a33ce658cfff4c390942e1766adf318baca69 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Mon, 8 Dec 2014 01:43:33 +0100 Subject: [PATCH 3/7] Update moduleconfig.h for all modules --- dlls/cstrike/cstrike/moduleconfig.h | 8 ++------ dlls/cstrike/csx/moduleconfig.h | 8 ++------ dlls/dod/dodfun/moduleconfig.h | 8 ++------ dlls/dod/dodx/moduleconfig.h | 8 ++------ dlls/engine/moduleconfig.h | 8 ++------ dlls/fakemeta/moduleconfig.h | 8 ++------ dlls/fun/moduleconfig.h | 8 ++------ dlls/geoip/moduleconfig.h | 8 ++------ dlls/hamsandwich/moduleconfig.h | 8 ++------ dlls/mysqlx/moduleconfig.h | 8 ++------ dlls/ns/moduleconfig.h | 8 ++------ dlls/nvault/moduleconfig.h | 8 ++------ dlls/regex/moduleconfig.h | 8 ++------ dlls/sockets/moduleconfig.h | 8 ++------ dlls/sqlite/moduleconfig.h | 8 ++------ dlls/tfcx/moduleconfig.h | 8 ++------ dlls/ts/tsfun/moduleconfig.h | 8 ++------ dlls/ts/tsx/moduleconfig.h | 8 ++------ 18 files changed, 36 insertions(+), 108 deletions(-) diff --git a/dlls/cstrike/cstrike/moduleconfig.h b/dlls/cstrike/cstrike/moduleconfig.h index 86139e62..52de1dfd 100644 --- a/dlls/cstrike/cstrike/moduleconfig.h +++ b/dlls/cstrike/cstrike/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "CStrike" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "CSTRIKE" diff --git a/dlls/cstrike/csx/moduleconfig.h b/dlls/cstrike/csx/moduleconfig.h index f2070e6e..d8aa5733 100644 --- a/dlls/cstrike/csx/moduleconfig.h +++ b/dlls/cstrike/csx/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "CSX" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "CSX" diff --git a/dlls/dod/dodfun/moduleconfig.h b/dlls/dod/dodfun/moduleconfig.h index 7a0316a4..c536673f 100644 --- a/dlls/dod/dodfun/moduleconfig.h +++ b/dlls/dod/dodfun/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "DoD Fun" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "DODFUN" diff --git a/dlls/dod/dodx/moduleconfig.h b/dlls/dod/dodx/moduleconfig.h index f32329e6..b58dff95 100644 --- a/dlls/dod/dodx/moduleconfig.h +++ b/dlls/dod/dodx/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "DoDX" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "DODX" diff --git a/dlls/engine/moduleconfig.h b/dlls/engine/moduleconfig.h index 932731c7..827f3234 100644 --- a/dlls/engine/moduleconfig.h +++ b/dlls/engine/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "Engine" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "ENGINE" diff --git a/dlls/fakemeta/moduleconfig.h b/dlls/fakemeta/moduleconfig.h index 95aceb5f..9f7d0e2b 100644 --- a/dlls/fakemeta/moduleconfig.h +++ b/dlls/fakemeta/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "FakeMeta" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "FAKEMETA" diff --git a/dlls/fun/moduleconfig.h b/dlls/fun/moduleconfig.h index a326ecde..0e492a7a 100644 --- a/dlls/fun/moduleconfig.h +++ b/dlls/fun/moduleconfig.h @@ -15,15 +15,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "Fun" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "FUN" diff --git a/dlls/geoip/moduleconfig.h b/dlls/geoip/moduleconfig.h index e2b075fb..67fd54fa 100644 --- a/dlls/geoip/moduleconfig.h +++ b/dlls/geoip/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "GeoIP" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "GEOIP" diff --git a/dlls/hamsandwich/moduleconfig.h b/dlls/hamsandwich/moduleconfig.h index d839cf0c..87a7d128 100644 --- a/dlls/hamsandwich/moduleconfig.h +++ b/dlls/hamsandwich/moduleconfig.h @@ -15,15 +15,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "Ham Sandwich" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "HAMSANDWICH" diff --git a/dlls/mysqlx/moduleconfig.h b/dlls/mysqlx/moduleconfig.h index 3ebdd4e4..cc9d2de5 100644 --- a/dlls/mysqlx/moduleconfig.h +++ b/dlls/mysqlx/moduleconfig.h @@ -14,11 +14,7 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include /** Module info * -The logtag is the tag that the module's log messages will be @@ -32,7 +28,7 @@ * to add multiple entries. */ #define MODULE_NAME "MySQL" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "MySQL" diff --git a/dlls/ns/moduleconfig.h b/dlls/ns/moduleconfig.h index b1f25265..955df1d7 100644 --- a/dlls/ns/moduleconfig.h +++ b/dlls/ns/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "NS" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "NS" diff --git a/dlls/nvault/moduleconfig.h b/dlls/nvault/moduleconfig.h index c51caa22..494767ad 100644 --- a/dlls/nvault/moduleconfig.h +++ b/dlls/nvault/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "nVault" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "nVault" diff --git a/dlls/regex/moduleconfig.h b/dlls/regex/moduleconfig.h index f7f0dc4a..6a7696c2 100644 --- a/dlls/regex/moduleconfig.h +++ b/dlls/regex/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "RegEx" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "REGEX" diff --git a/dlls/sockets/moduleconfig.h b/dlls/sockets/moduleconfig.h index 85dbea26..103be9ee 100644 --- a/dlls/sockets/moduleconfig.h +++ b/dlls/sockets/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "Sockets" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "HLSW Dev Team" #define MODULE_URL "http://www.hlsw.net/" #define MODULE_LOGTAG "SOCKET" diff --git a/dlls/sqlite/moduleconfig.h b/dlls/sqlite/moduleconfig.h index 7250a93b..d7ccc94b 100644 --- a/dlls/sqlite/moduleconfig.h +++ b/dlls/sqlite/moduleconfig.h @@ -14,15 +14,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "SQLite" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "SQLITE" diff --git a/dlls/tfcx/moduleconfig.h b/dlls/tfcx/moduleconfig.h index 320c8e4a..2107c971 100644 --- a/dlls/tfcx/moduleconfig.h +++ b/dlls/tfcx/moduleconfig.h @@ -15,15 +15,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "TfcX" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "TFCX" diff --git a/dlls/ts/tsfun/moduleconfig.h b/dlls/ts/tsfun/moduleconfig.h index c3ca7103..e68be3e5 100644 --- a/dlls/ts/tsfun/moduleconfig.h +++ b/dlls/ts/tsfun/moduleconfig.h @@ -15,15 +15,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "TSFun Wrapper" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org" #define MODULE_LOGTAG "TSFUN" diff --git a/dlls/ts/tsx/moduleconfig.h b/dlls/ts/tsx/moduleconfig.h index c1a91352..1d9e28c5 100644 --- a/dlls/ts/tsx/moduleconfig.h +++ b/dlls/ts/tsx/moduleconfig.h @@ -15,15 +15,11 @@ #ifndef __MODULECONFIG_H__ #define __MODULECONFIG_H__ -#if defined AMBUILD -# include -#else -# define SVN_VERSION "dev-local" -#endif +#include // Module info #define MODULE_NAME "TSX" -#define MODULE_VERSION SVN_VERSION +#define MODULE_VERSION AMXX_VERSION #define MODULE_AUTHOR "AMX Mod X Dev Team" #define MODULE_URL "http://www.amxmodx.org/" #define MODULE_LOGTAG "TSX" From f5e23903a2ff5d8e09a146cbaca52b91a615f3fd Mon Sep 17 00:00:00 2001 From: Arkshine Date: Mon, 8 Dec 2014 01:44:27 +0100 Subject: [PATCH 4/7] Add version.rc in AMBuilder for all modules --- dlls/cstrike/cstrike/AMBuilder | 5 ++++- dlls/cstrike/csx/AMBuilder | 3 +++ dlls/dod/dodfun/AMBuilder | 3 +++ dlls/dod/dodx/AMBuilder | 3 +++ dlls/engine/AMBuilder | 7 +++++-- dlls/fakemeta/AMBuilder | 3 +++ dlls/fun/AMBuilder | 5 ++++- dlls/geoip/AMBuilder | 3 +++ dlls/hamsandwich/AMBuilder | 3 +++ dlls/mysqlx/AMBuilder | 3 +++ dlls/ns/AMBuilder | 3 +++ dlls/nvault/AMBuilder | 3 +++ dlls/regex/AMBuilder | 4 ++++ dlls/sockets/AMBuilder | 3 +++ dlls/sqlite/AMBuilder | 2 ++ dlls/tfcx/AMBuilder | 3 +++ dlls/ts/tsfun/AMBuilder | 3 +++ dlls/ts/tsx/AMBuilder | 3 +++ 18 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/cstrike/cstrike/AMBuilder b/dlls/cstrike/cstrike/AMBuilder index 9910b69e..aaffd58f 100644 --- a/dlls/cstrike/cstrike/AMBuilder +++ b/dlls/cstrike/cstrike/AMBuilder @@ -6,7 +6,7 @@ binary = AMXX.MetaModule(builder, 'cstrike') binary.compiler.defines += [ 'HAVE_STDINT_H', ] - + binary.sources = [ '../../../public/sdk/amxxmodule.cpp', 'amxx_api.cpp', @@ -19,4 +19,7 @@ binary.sources = [ '../../../public/memtools/CDetour/asm/asm.c', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/cstrike/csx/AMBuilder b/dlls/cstrike/csx/AMBuilder index 6e9925f5..c4f76d57 100644 --- a/dlls/cstrike/csx/AMBuilder +++ b/dlls/cstrike/csx/AMBuilder @@ -12,4 +12,7 @@ binary.sources = [ 'usermsg.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/dod/dodfun/AMBuilder b/dlls/dod/dodfun/AMBuilder index 1617ce21..ed9bbb00 100644 --- a/dlls/dod/dodfun/AMBuilder +++ b/dlls/dod/dodfun/AMBuilder @@ -13,4 +13,7 @@ binary.sources = [ 'moduleconfig.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/dod/dodx/AMBuilder b/dlls/dod/dodx/AMBuilder index 67d9b368..5df82d46 100644 --- a/dlls/dod/dodx/AMBuilder +++ b/dlls/dod/dodx/AMBuilder @@ -14,4 +14,7 @@ binary.sources = [ 'moduleconfig.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/engine/AMBuilder b/dlls/engine/AMBuilder index efa278ae..e94a3797 100644 --- a/dlls/engine/AMBuilder +++ b/dlls/engine/AMBuilder @@ -6,7 +6,7 @@ binary = AMXX.MetaModule(builder, 'engine') binary.compiler.defines += [ 'HAVE_STDINT_H', ] - + binary.sources = [ '../../public/sdk/amxxmodule.cpp', 'amxxapi.cpp', @@ -15,5 +15,8 @@ binary.sources = [ 'globals.cpp', 'forwards.cpp', ] - + +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/fakemeta/AMBuilder b/dlls/fakemeta/AMBuilder index 3d2a5552..bf6c495f 100644 --- a/dlls/fakemeta/AMBuilder +++ b/dlls/fakemeta/AMBuilder @@ -21,4 +21,7 @@ binary.sources = [ 'misc.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/fun/AMBuilder b/dlls/fun/AMBuilder index 25b16ff9..d7222b23 100644 --- a/dlls/fun/AMBuilder +++ b/dlls/fun/AMBuilder @@ -2,10 +2,13 @@ import os.path binary = AMXX.MetaModule(builder, 'fun') - + binary.sources = [ '../../public/sdk/amxxmodule.cpp', 'fun.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/geoip/AMBuilder b/dlls/geoip/AMBuilder index a7a86d98..6f76ef27 100644 --- a/dlls/geoip/AMBuilder +++ b/dlls/geoip/AMBuilder @@ -15,6 +15,9 @@ binary.sources = [ 'geoip_util.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + if builder.target_platform == 'windows': binary.compiler.postlink += ['ws2_32.lib'] binary.compiler.includes += [os.path.join(builder.sourcePath, 'dlls', 'geoip', 'GeoIP2')] diff --git a/dlls/hamsandwich/AMBuilder b/dlls/hamsandwich/AMBuilder index c6cd6409..29f5bc1c 100644 --- a/dlls/hamsandwich/AMBuilder +++ b/dlls/hamsandwich/AMBuilder @@ -21,4 +21,7 @@ binary.sources = [ 'hook_specialbot.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/mysqlx/AMBuilder b/dlls/mysqlx/AMBuilder index a8524830..3ec1305b 100644 --- a/dlls/mysqlx/AMBuilder +++ b/dlls/mysqlx/AMBuilder @@ -45,6 +45,9 @@ if AMXX.mysql_path: 'mysql/MysqlDriver.cpp', ] + if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + if builder.target_platform == 'windows': binary.sources += [ 'thread/WinThreads.cpp', diff --git a/dlls/ns/AMBuilder b/dlls/ns/AMBuilder index 10498892..81130d8c 100644 --- a/dlls/ns/AMBuilder +++ b/dlls/ns/AMBuilder @@ -26,4 +26,7 @@ binary.sources = [ 'natives/memberfuncs.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/nvault/AMBuilder b/dlls/nvault/AMBuilder index 11685b90..52d3f012 100644 --- a/dlls/nvault/AMBuilder +++ b/dlls/nvault/AMBuilder @@ -15,4 +15,7 @@ binary.sources = [ 'NVault.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/regex/AMBuilder b/dlls/regex/AMBuilder index 0775e479..07a66fcf 100644 --- a/dlls/regex/AMBuilder +++ b/dlls/regex/AMBuilder @@ -14,6 +14,7 @@ binary.compiler.defines += [ 'PCRE_STATIC', 'HAVE_STDINT_H', ] + binary.sources = [ '../../public/sdk/amxxmodule.cpp', 'module.cpp', @@ -21,4 +22,7 @@ binary.sources = [ 'utils.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/sockets/AMBuilder b/dlls/sockets/AMBuilder index 7ceb5c74..22a93d8d 100644 --- a/dlls/sockets/AMBuilder +++ b/dlls/sockets/AMBuilder @@ -8,6 +8,9 @@ binary.sources = [ 'sockets.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + if builder.target_platform == 'windows': binary.compiler.postlink += ['wsock32.lib', 'ws2_32.lib'] diff --git a/dlls/sqlite/AMBuilder b/dlls/sqlite/AMBuilder index 2c29b612..913860aa 100644 --- a/dlls/sqlite/AMBuilder +++ b/dlls/sqlite/AMBuilder @@ -82,5 +82,7 @@ else: 'sqlite-source/os_unix.c', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] AMXX.modules += [builder.Add(binary)] diff --git a/dlls/tfcx/AMBuilder b/dlls/tfcx/AMBuilder index 80e95188..c49e522e 100644 --- a/dlls/tfcx/AMBuilder +++ b/dlls/tfcx/AMBuilder @@ -14,4 +14,7 @@ binary.sources = [ 'moduleconfig.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/ts/tsfun/AMBuilder b/dlls/ts/tsfun/AMBuilder index 97d90a77..e2093512 100644 --- a/dlls/ts/tsfun/AMBuilder +++ b/dlls/ts/tsfun/AMBuilder @@ -7,4 +7,7 @@ binary.sources = [ '../../../public/sdk/amxxmodule.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] diff --git a/dlls/ts/tsx/AMBuilder b/dlls/ts/tsx/AMBuilder index 6b9945c4..c3df01fe 100644 --- a/dlls/ts/tsx/AMBuilder +++ b/dlls/ts/tsx/AMBuilder @@ -14,4 +14,7 @@ binary.sources = [ 'usermsg.cpp', ] +if builder.target_platform == 'windows': + binary.sources += ['version.rc'] + AMXX.modules += [builder.Add(binary)] From 8443a836aa48ab2975ccee5ec37fcd7cfc425616 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Mon, 8 Dec 2014 01:44:51 +0100 Subject: [PATCH 5/7] Add the actual version.rc file for all modules --- dlls/cstrike/cstrike/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/cstrike/csx/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/dod/dodfun/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/dod/dodx/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/engine/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/fakemeta/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/fun/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/geoip/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/hamsandwich/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/mysqlx/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/ns/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/nvault/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/regex/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/sockets/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/sqlite/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/tfcx/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/ts/tsfun/version.rc | 101 ++++++++++++++++++++++++++++++++ dlls/ts/tsx/version.rc | 101 ++++++++++++++++++++++++++++++++ 18 files changed, 1818 insertions(+) create mode 100644 dlls/cstrike/cstrike/version.rc create mode 100644 dlls/cstrike/csx/version.rc create mode 100644 dlls/dod/dodfun/version.rc create mode 100644 dlls/dod/dodx/version.rc create mode 100644 dlls/engine/version.rc create mode 100644 dlls/fakemeta/version.rc create mode 100644 dlls/fun/version.rc create mode 100644 dlls/geoip/version.rc create mode 100644 dlls/hamsandwich/version.rc create mode 100644 dlls/mysqlx/version.rc create mode 100644 dlls/ns/version.rc create mode 100644 dlls/nvault/version.rc create mode 100644 dlls/regex/version.rc create mode 100644 dlls/sockets/version.rc create mode 100644 dlls/sqlite/version.rc create mode 100644 dlls/tfcx/version.rc create mode 100644 dlls/ts/tsfun/version.rc create mode 100644 dlls/ts/tsx/version.rc diff --git a/dlls/cstrike/cstrike/version.rc b/dlls/cstrike/cstrike/version.rc new file mode 100644 index 00000000..e58da539 --- /dev/null +++ b/dlls/cstrike/cstrike/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include "moduleconfig.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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/cstrike/csx/version.rc b/dlls/cstrike/csx/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/cstrike/csx/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/dod/dodfun/version.rc b/dlls/dod/dodfun/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/dod/dodfun/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/dod/dodx/version.rc b/dlls/dod/dodx/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/dod/dodx/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/engine/version.rc b/dlls/engine/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/engine/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/fakemeta/version.rc b/dlls/fakemeta/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/fakemeta/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/fun/version.rc b/dlls/fun/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/fun/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/geoip/version.rc b/dlls/geoip/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/geoip/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/hamsandwich/version.rc b/dlls/hamsandwich/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/hamsandwich/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/mysqlx/version.rc b/dlls/mysqlx/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/mysqlx/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/ns/version.rc b/dlls/ns/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/ns/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/nvault/version.rc b/dlls/nvault/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/nvault/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/regex/version.rc b/dlls/regex/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/regex/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/sockets/version.rc b/dlls/sockets/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/sockets/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/sqlite/version.rc b/dlls/sqlite/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/sqlite/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/tfcx/version.rc b/dlls/tfcx/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/tfcx/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/ts/tsfun/version.rc b/dlls/ts/tsfun/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/ts/tsfun/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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/dlls/ts/tsx/version.rc b/dlls/ts/tsx/version.rc new file mode 100644 index 00000000..26bd500f --- /dev/null +++ b/dlls/ts/tsx/version.rc @@ -0,0 +1,101 @@ +// Microsoft Visual C++ generated resource script. +// +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include +#include + +///////////////////////////////////////////////////////////////////////////// +#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 AMXX_VERSION_FILE + PRODUCTVERSION AMXX_VERSION_FILE + 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", "AMX Mod X" + VALUE "FileDescription", "AMX Mod X" + VALUE "FileVersion", AMXX_VERSION + VALUE "InternalName", MODULE_LIBRARY + VALUE "LegalCopyright", "Copyright (c) AMX Mod X Dev Team" + VALUE "OriginalFilename", MODULE_LIBRARY "_amxx.dll" + VALUE "ProductName", MODULE_NAME + VALUE "ProductVersion", AMXX_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 + From f4a3d07b0e4465b97a2128aa1263d7f4d933c761 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Wed, 10 Dec 2014 15:05:47 +0100 Subject: [PATCH 6/7] Fix missing binary suffix --- AMBuildScript | 13 ++----------- dlls/nvault/AMBuilder | 2 +- dlls/regex/AMBuilder | 2 +- dlls/sockets/AMBuilder | 2 +- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 51cfe01d..72a2b667 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -304,30 +304,21 @@ class AMXXConfig(object): return self.AddVersioning(binary) def MetaPlugin(self, context, name): - binary = context.compiler.Library(name) - self.ConfigureForModule(context, binary.compiler) - if builder.target_platform == 'mac' or builder.target_platform == 'windows': name = name + '_mm' elif builder.target_platform == 'linux': name = name + '_mm_i386' - - return self.AddVersioning(binary) - - def Module(self, context, name): binary = context.compiler.Library(name) self.ConfigureForModule(context, binary.compiler) return self.AddVersioning(binary) def MetaModule(self, context, name): - binary = context.compiler.Library(name) - self.ConfigureForModule(context, binary.compiler) - if builder.target_platform == 'mac' or builder.target_platform == 'windows': name = name + '_amxx' elif builder.target_platform == 'linux': name = name + '_amxx_i386' - + binary = context.compiler.Library(name) + self.ConfigureForModule(context, binary.compiler) return self.AddVersioning(binary) def Program(self, context, name): diff --git a/dlls/nvault/AMBuilder b/dlls/nvault/AMBuilder index 52d3f012..0927ae74 100644 --- a/dlls/nvault/AMBuilder +++ b/dlls/nvault/AMBuilder @@ -1,7 +1,7 @@ # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os.path -binary = AMXX.Module(builder, 'nvault') +binary = AMXX.MetaModule(builder, 'nvault') binary.compiler.defines += [ 'HAVE_STDINT_H', diff --git a/dlls/regex/AMBuilder b/dlls/regex/AMBuilder index 07a66fcf..6faa6e92 100644 --- a/dlls/regex/AMBuilder +++ b/dlls/regex/AMBuilder @@ -1,7 +1,7 @@ # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os.path -binary = AMXX.Module(builder, 'regex') +binary = AMXX.MetaModule(builder, 'regex') if builder.target_platform == 'linux': binary.compiler.postlink += [binary.Dep('lib_linux/libpcre.a')] diff --git a/dlls/sockets/AMBuilder b/dlls/sockets/AMBuilder index 22a93d8d..f14c8512 100644 --- a/dlls/sockets/AMBuilder +++ b/dlls/sockets/AMBuilder @@ -1,7 +1,7 @@ # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: import os.path -binary = AMXX.Module(builder, 'sockets') +binary = AMXX.MetaModule(builder, 'sockets') binary.sources = [ '../../public/sdk/amxxmodule.cpp', From ab4294f3cacad0ab1cea41bef72134577bbc4a64 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Wed, 10 Dec 2014 15:41:52 +0100 Subject: [PATCH 7/7] Fix linux compilation --- compiler/amxxpc/amx.cpp | 2 +- compiler/amxxpc/amx.h | 2 +- compiler/libpc300/amx.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/amxxpc/amx.cpp b/compiler/amxxpc/amx.cpp index 4893b3d2..17b7820e 100755 --- a/compiler/amxxpc/amx.cpp +++ b/compiler/amxxpc/amx.cpp @@ -41,7 +41,7 @@ #include #include "osdefs.h" #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ - #include + #include "sclinux.h" #if !defined AMX_NODYNALOAD #include #endif diff --git a/compiler/amxxpc/amx.h b/compiler/amxxpc/amx.h index 4c0721a5..8dbec757 100755 --- a/compiler/amxxpc/amx.h +++ b/compiler/amxxpc/amx.h @@ -23,7 +23,7 @@ #define __FreeBSD__ #endif #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ - #include + #include "sclinux.h" #endif #ifndef AMX_H_INCLUDED diff --git a/compiler/libpc300/amx.h b/compiler/libpc300/amx.h index 7cdebe94..abd9fbb6 100755 --- a/compiler/libpc300/amx.h +++ b/compiler/libpc300/amx.h @@ -32,7 +32,7 @@ #define __FreeBSD__ #endif #if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ - #include + #include "sclinux.h" #endif #ifndef AMX_H_INCLUDED