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

Imported support for new build system.

Browse Source
This commit is contained in:
David Anderson
2009-08-30 00:21:42 -07:00
parent 83393f299a
commit d3f0a14867
129 changed files with 406 additions and 3409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sourcepawn/compiler/libpawnc.rc
+5 -5
View File
@@ -4,7 +4,7 @@
#else
# include <ver.h>
#endif
#include "svn_version.h"
#include <sourcemod_version.h>
AppIcon ICON "pawn.ico"
@@ -19,8 +19,8 @@ AppIcon ICON "pawn.ico"
#define VERSIONPRODUCTNAME "smcomp\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION SVN_FILE_VERSION
PRODUCTVERSION SVN_FILE_VERSION
FILEVERSION SM_FILE_VERSION
PRODUCTVERSION SM_FILE_VERSION
FILEFLAGSMASK 0x0000003FL
FILEFLAGS 0
#if defined(WIN32)
@@ -36,12 +36,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
VALUE "FileDescription", VERSIONDESCRIPTION
VALUE "FileVersion", SVN_FULL_VERSION
VALUE "FileVersion", SM_FULL_VERSION
VALUE "InternalName", VERSIONNAME
VALUE "LegalCopyright", "(C)1998-2006 ITB CompuPhase, AlliedModders LLC\0"
VALUE "OriginalFilename", VERSIONNAME
VALUE "ProductName", VERSIONPRODUCTNAME
VALUE "ProductVersion", SVN_FULL_VERSION
VALUE "ProductVersion", SM_FULL_VERSION
END
END
sourcepawn/compiler/pawncc.c
+5
View File
@@ -8,6 +8,11 @@
#include "amxdbg.h"
#include "osdefs.h"
#include "zlib/zlib.h"
#if defined LINUX
#include <unistd.h>
#elif defined WIN32
#include <io.h>
#endif
enum FileSections
{
sourcepawn/compiler/sc1.c
+35 -43
View File
@@ -38,6 +38,7 @@
#if defined LINUX || defined __FreeBSD__ || defined __OpenBSD__
#include <sclinux.h>
#include <binreloc.h> /* from BinReloc, see www.autopackage.org */
#include <unistd.h>
#endif
#if defined FORTIFY
@@ -65,7 +66,7 @@
#include "lstring.h"
#include "sc.h"
#include "svn_version.h"
#include <sourcemod_version.h>
#include "sctracker.h"
#define VERSION_STR "3.2.3636"
#define VERSION_INT 0x0302
@@ -172,7 +173,7 @@ static int *wqptr; /* pointer to next entry */
static HWND hwndFinish = 0;
#endif
SC_VDECL int glbstringread = 0;
int glbstringread = 0;
char g_tmpfile[_MAX_PATH] = {0};
/* "main" of the compiler
@@ -805,24 +806,17 @@ SC_FUNC void set_extension(char *filename,char *extension,int force)
strcat(filename,extension);
}
static const char *option_value(const char *optptr,char **argv,int argc,int *arg)
static const char *option_value(const char *optptr)
{
const char *ptr;
if (*(optptr+1)=='=' || *(optptr+1)==':')
ptr=optptr+2;
else
ptr=optptr+1;
if (strlen(ptr)==0 && *arg!=argc-1)
ptr=argv[++*arg];
return ptr;
return (*(optptr+1)=='=' || *(optptr+1)==':') ? optptr+2 : optptr+1;
}
static int toggle_option(const char *optptr,int option)
static int toggle_option(const char *optptr, int option)
{
switch ((*(optptr+1)=='=' || *(optptr+1)==':') ? *(optptr+2) : *(optptr+1)) {
switch (*option_value(optptr)) {
case '\0':
option=!option;
break;
case '-':
option=FALSE;
break;
@@ -860,7 +854,7 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
ptr=&argv[arg][1];
switch (*ptr) {
case 'A':
i=atoi(option_value(ptr,argv,argc,&arg));
i=atoi(option_value(ptr));
if ((i % sizeof(cell))==0)
sc_dataalign=i;
else
@@ -883,11 +877,11 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
break;
#endif
case 'c':
strlcpy(codepage,option_value(ptr,argv,argc,&arg),MAXCODEPAGE); /* set name of codepage */
strlcpy(codepage,option_value(ptr),MAXCODEPAGE); /* set name of codepage */
break;
#if defined dos_setdrive
case 'D': /* set active directory */
ptr=option_value(ptr,argv,argc,&arg);
ptr=option_value(ptr);
if (ptr[1]==':')
dos_setdrive(toupper(*ptr)-'A'+1); /* set active drive */
chdir(ptr);
@@ -895,7 +889,7 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
#endif
#if 0 /* not allowed to change for SourceMod */
case 'd':
switch (*option_value(ptr,argv,argc,&arg)) {
switch (*option_value(ptr)) {
case '0':
sc_debug=0;
break;
@@ -916,17 +910,17 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
break;
#endif
case 'e':
strlcpy(ename,option_value(ptr,argv,argc,&arg),_MAX_PATH); /* set name of error file */
strlcpy(ename,option_value(ptr),_MAX_PATH); /* set name of error file */
break;
#if defined __WIN32__ || defined _WIN32 || defined _Windows
case 'H':
hwndFinish=(HWND)atoi(option_value(ptr,argv,argc,&arg));
hwndFinish=(HWND)atoi(option_value(ptr));
if (!IsWindow(hwndFinish))
hwndFinish=(HWND)0;
break;
#endif
case 'i':
strlcpy(str,option_value(ptr,argv,argc,&arg),sizeof str); /* set name of include directory */
strlcpy(str,option_value(ptr),sizeof str); /* set name of include directory */
i=strlen(str);
if (i>0) {
if (str[i-1]!=DIRSEP_CHAR) {
@@ -942,22 +936,21 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
sc_listing=TRUE; /* skip second pass & code generation */
break;
case 'o':
strlcpy(oname,option_value(ptr,argv,argc,&arg),_MAX_PATH); /* set name of (binary) output file */
strlcpy(oname,option_value(ptr),_MAX_PATH); /* set name of (binary) output file */
break;
case 'O':
pc_optimize=*option_value(ptr,argv,argc,&arg) - '0';
pc_optimize=*option_value(ptr) - '0';
if (pc_optimize<sOPTIMIZE_NONE || pc_optimize>=sOPTIMIZE_NUMBER || pc_optimize==sOPTIMIZE_NOMACRO)
about();
break;
case 'p':
strlcpy(pname,option_value(ptr,argv,argc,&arg),_MAX_PATH); /* set name of implicit include file */
strlcpy(pname,option_value(ptr),_MAX_PATH); /* set name of implicit include file */
break;
#if !defined SC_LIGHT
case 'r':
strlcpy(rname,option_value(ptr,argv,argc,&arg),_MAX_PATH); /* set name of report file */
strlcpy(rname,option_value(ptr),_MAX_PATH); /* set name of report file */
sc_makereport=TRUE;
#if 0 /* dead code due to option_value change to allow spaces between option and value */
if (strlen(rname)>0) {
if (strlen(rname)>0) {
set_extension(rname,".xml",FALSE);
} else if ((name=get_sourcefile(0))!=NULL) {
assert(strlen(rname)==0);
@@ -970,29 +963,28 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
strcpy(rname,ptr);
set_extension(rname,".xml",TRUE);
} /* if */
#endif
break;
#endif
case 'S':
i=atoi(option_value(ptr,argv,argc,&arg));
i=atoi(option_value(ptr));
if (i>32)
pc_stksize=(cell)i; /* stack size has minimum size */
else
about();
break;
case 's':
skipinput=atoi(option_value(ptr,argv,argc,&arg));
skipinput=atoi(option_value(ptr));
break;
case 't':
sc_tabsize=atoi(option_value(ptr,argv,argc,&arg));
sc_tabsize=atoi(option_value(ptr));
break;
case 'v':
verbosity= isdigit(*option_value(ptr,argv,argc,&arg)) ? atoi(option_value(ptr,argv,argc,&arg)) : 2;
verbosity= isdigit(*option_value(ptr)) ? atoi(option_value(ptr)) : 2;
if (sc_asmfile && verbosity>1)
verbosity=1;
break;
case 'w':
i=(int)strtol(option_value(ptr,argv,argc,&arg),(char **)&ptr,10);
i=(int)strtol(option_value(ptr),(char **)&ptr,10);
if (*ptr=='-')
pc_enablewarning(i,0);
else if (*ptr=='+')
@@ -1002,13 +994,13 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
break;
case 'X':
if (*(ptr+1)=='D') {
i=atoi(option_value(ptr+1,argv,argc,&arg));
i=atoi(option_value(ptr+1));
if (i>64)
pc_amxram=(cell)i; /* abstract machine data/stack has minimum size */
else
about();
} else {
i=atoi(option_value(ptr,argv,argc,&arg));
i=atoi(option_value(ptr));
if (i>64)
pc_amxlimit=(cell)i;/* abstract machine has minimum size */
else
@@ -1235,8 +1227,8 @@ static void setconfig(char *root)
static void setcaption(void)
{
pc_printf("SourcePawn Compiler " SVN_FULL_VERSION "\n");
pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2009 AlliedModders, LLC\n\n");
pc_printf("SourcePawn Compiler " SM_FULL_VERSION "\n");
pc_printf("Copyright (c) 1997-2006, ITB CompuPhase, (C)2004-2008 AlliedModders, LLC\n\n");
}
static void about(void)
@@ -1276,7 +1268,7 @@ static void about(void)
pc_printf(" 2 full optimizations\n");
pc_printf(" -p<name> set name of \"prefix\" file\n");
#if !defined SC_LIGHT
pc_printf(" -r<name> write cross reference report to console or to specified file\n");
pc_printf(" -r[name] write cross reference report to console or to specified file\n");
#endif
pc_printf(" -S<num> stack/heap size in cells (default=%d)\n",(int)pc_stksize);
pc_printf(" -s<num> skip lines from the input file\n");
@@ -1287,7 +1279,7 @@ static void about(void)
pc_printf(" -XD<num> abstract machine data/stack size limit in bytes\n");
pc_printf(" -\\ use '\\' for escape characters\n");
pc_printf(" -^ use '^' for escape characters\n");
pc_printf(" -;<+/-> require a semicolon to end each statement (default=%c)\n", sc_needsemicolon ? '+' : '-');
pc_printf(" -;[+/-] require a semicolon to end each statement (default=%c)\n", sc_needsemicolon ? '+' : '-');
#if 0 /* not allowed in SourceMod */
pc_printf(" -([+/-] require parantheses for function invocation (default=%c)\n", optproccall ? '-' : '+');
#endif
@@ -1298,8 +1290,8 @@ static void about(void)
pc_printf("equivalent.\n");
#endif
pc_printf("\nOptions with a value may optionally separate the value from the option letter\n");
pc_printf("with a colon (\":\"), an equal sign (\"=\"), or a space (\" \"). That is, the options \"-d0\", \"-d=0\",\n");
pc_printf("\"-d:0\", and \"-d 0\" are all equivalent. \"-;\" is an exception to this and cannot use a space.\n");
pc_printf("with a colon (\":\") or an equal sign (\"=\"). That is, the options \"-d0\", \"-d=0\"\n");
pc_printf("and \"-d:0\" are all equivalent.\n");
} /* if */
norun = 1;
longjmp(errbuf,3); /* user abort */
sourcepawn/compiler/sc2.c
+9 -22
View File
@@ -58,6 +58,13 @@ static short skiplevel; /* level at which we started skipping (including nested
static unsigned char term_expr[] = "";
static int listline=-1; /* "current line" for the list file */
#if defined __GNUC__
static double pow10(double d)
{
return pow(10, d);
}
#endif
/* pushstk & popstk
*
@@ -602,26 +609,6 @@ static int htoi(cell *val,const unsigned char *curptr)
return (int)(ptr-curptr);
}
#if defined __GNUC__
static double pow10(int value)
{
double res=1.0;
while (value>=4) {
res*=10000.0;
value-=5;
} /* while */
while (value>=2) {
res*=100.0;
value-=2;
} /* while */
while (value>=1) {
res*=10.0;
value-=1;
} /* while */
return res;
}
#endif
/* ftoi
*
* Attempts to interpret a numeric symbol as a rational number, either as
@@ -954,7 +941,7 @@ static int command(void)
if (skiplevel==iflevel)
preproc_expr(&val,NULL); /* get, but ignore the expression */
else
lptr=strchr(lptr,'\0');
lptr=(unsigned char*)strchr((char*)lptr,'\0');
} /* if */
} else {
/* previous conditions were all FALSE */
@@ -965,7 +952,7 @@ static int command(void)
if (skiplevel==iflevel) {
preproc_expr(&val,NULL); /* get value (or 0 on error) */
} else {
lptr=strchr(lptr,'\0');
lptr=(unsigned char*)strchr((char*)lptr,'\0');
val=0;
} /* if */
ifstack[iflevel-1]=(char)(val ? PARSEMODE : SKIPMODE);
sourcepawn/compiler/sclinux.h
-1
View File
@@ -16,7 +16,6 @@
*/
#include "getch.h"
#define stricmp(a,b) strcasecmp(a,b)
#define strnicmp(a,b,c) strncasecmp(a,b,c)
/*
sourcepawn/compiler/svn_version.h
-27
View File
@@ -1,27 +0,0 @@
/**
* vim: set ts=4 :
* ===============================================================
* SourceMod (C)2004-2008 AlliedModders LLC. All rights reserved.
* ===============================================================
*
* This file is not open source and may not be copied without explicit
* written permission of AlliedModders LLC. This file may not be redistributed
* in whole or significant part.
* For information, see LICENSE.txt or http://www.sourcemod.net/license.php
*
* Version: $Id$
*/
#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
#define _INCLUDE_SOURCEMOD_VERSION_H_
/**
* @file Contains SourceMod version information.
*/
#define SM_BUILD_STRING "-dev"
#define SM_BUILD_UNIQUEID "2650:5d34bc3edbfa" SM_BUILD_STRING
#define SVN_FULL_VERSION "1.3.0" SM_BUILD_STRING
#define SVN_FILE_VERSION 1,3,0,0
#endif //_INCLUDE_SOURCEMOD_VERSION_H_
sourcepawn/compiler/svn_version.tpl
-27
View File
@@ -1,27 +0,0 @@
/**
* vim: set ts=4 :
* ===============================================================
* SourceMod (C)2004-2008 AlliedModders LLC. All rights reserved.
* ===============================================================
*
* This file is not open source and may not be copied without explicit
* written permission of AlliedModders LLC. This file may not be redistributed
* in whole or significant part.
* For information, see LICENSE.txt or http://www.sourcemod.net/license.php
*
* Version: $Id$
*/
#ifndef _INCLUDE_SOURCEMOD_VERSION_H_
#define _INCLUDE_SOURCEMOD_VERSION_H_
/**
* @file Contains SourceMod version information.
*/
#define SM_BUILD_STRING "$BUILD_STRING$"
#define SM_BUILD_UNIQUEID "$BUILD_ID$" SM_BUILD_STRING
#define SVN_FULL_VERSION "$PMAJOR$.$PMINOR$.$PREVISION$" SM_BUILD_STRING
#define SVN_FILE_VERSION $PMAJOR$,$PMINOR$,$PREVISION$,0
#endif //_INCLUDE_SOURCEMOD_VERSION_H_
sourcepawn/compiler/zlib/crc32.c
+1
View File
@@ -19,6 +19,7 @@
one thread to use crc32().
*/
#include <stdio.h>
#ifdef MAKECRCH
# include <stdio.h>
# ifndef DYNAMIC_CRC_TABLE
sourcepawn/compiler/zlib/deflate.c
+1
View File
@@ -49,6 +49,7 @@
/* @(#) $Id$ */
#include <stdio.h>
#include "deflate.h"
const char deflate_copyright[] =
sourcepawn/compiler/zlib/infback.c
+1
View File
@@ -10,6 +10,7 @@
inflate_fast() can be used with either inflate.c or infback.c.
*/
#include <stdio.h>
#include "zutil.h"
#include "inftrees.h"
#include "inflate.h"
sourcepawn/compiler/zlib/inffast.c
+1
View File
@@ -3,6 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
#include <stdio.h>
#include "zutil.h"
#include "inftrees.h"
#include "inflate.h"
sourcepawn/compiler/zlib/inflate.c
+1
View File
@@ -80,6 +80,7 @@
* The history for versions after 1.2.0 are in ChangeLog in zlib distribution.
*/
#include <stdio.h>
#include "zutil.h"
#include "inftrees.h"
#include "inflate.h"
sourcepawn/compiler/zlib/inftrees.c
+1
View File
@@ -3,6 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
#include <stdio.h>
#include "zutil.h"
#include "inftrees.h"
sourcepawn/compiler/zlib/trees.c
+1
View File
@@ -33,6 +33,7 @@
/* #define GEN_TREES_H */
#include <stdio.h>
#include "deflate.h"
#ifdef DEBUG
sourcepawn/compiler/zlib/zutil.c
+1
View File
@@ -5,6 +5,7 @@
/* @(#) $Id$ */
#include <stdio.h>
#include "zutil.h"
#ifndef NO_DUMMY_DECL