UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Nicholas Hastings 2012-09-11 18:27:50 -04:00
commit e55b7fa70f
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/include/version.inc
View File

@ -35,9 +35,9 @@
#endif #endif
#define _version_included #define _version_included
#if defined SM_GENERATED_BUILD #tryinclude <version_auto>
#include <version_auto>
#else #if !defined _auto_version_included
#define SOURCEMOD_V_TAG "manual" #define SOURCEMOD_V_TAG "manual"
#define SOURCEMOD_V_REV 0 #define SOURCEMOD_V_REV 0
#define SOURCEMOD_V_CSET "0" #define SOURCEMOD_V_CSET "0"
@ -45,5 +45,5 @@
#define SOURCEMOD_V_MINOR 5 /**< SourceMod Minor version */ #define SOURCEMOD_V_MINOR 5 /**< SourceMod Minor version */
#define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */ #define SOURCEMOD_V_RELEASE 0 /**< SourceMod Release version */
#define SOURCEMOD_VERSION "1.5.0-manual" /**< SourceMod version string (major.minor.release.build) */ #define SOURCEMOD_VERSION "1.5.0-manual" /**< SourceMod version string (major.minor.release-tag) */
#endif #endif

6
sourcepawn/jit/BaseRuntime.cpp
View File

@ -219,7 +219,11 @@ int BaseRuntime::CreateFromMemory(sp_file_hdr_t *hdr, uint8_t *base)
return SP_ERROR_FILE_FORMAT; return SP_ERROR_FILE_FORMAT;
} }
if ((plugin->flags & SP_FLAG_DEBUG) && (!(plugin->debug.files) || !(plugin->debug.lines) || !(plugin->debug.symbols))) if ((plugin->flags & SP_FLAG_DEBUG) && (
!(plugin->debug.files) ||
!(plugin->debug.lines) ||
!(plugin->debug.symbols) ||
!(plugin->debug.stringbase) ))
{ {
return SP_ERROR_FILE_FORMAT; return SP_ERROR_FILE_FORMAT;
} }

3
tools/buildbot/PackageScript
View File

@ -184,6 +184,9 @@ for plugin in disPlugins:
os.path.join('addons', 'sourcemod', 'plugins', 'disabled'))) os.path.join('addons', 'sourcemod', 'plugins', 'disabled')))
job.AddCommandGroup(commands) job.AddCommandGroup(commands)
job.AddCommand(CopyFile(os.path.join('..', 'includes', 'version_auto.inc'),
os.path.join('addons', 'sourcemod', 'scripting', 'include')))
bincopies = [] bincopies = []
def AddNormalLibrary(name, dest): def AddNormalLibrary(name, dest):