fallout2sfall/sslc
0
0
Fork 0
mirror of https://github.com/sfall-team/sslc.git synced 2026-07-27 16:52:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged changes from sfall 4.2.1 modderspack:

Browse Source 
* Added -m<macro[=val]> and -I<path> options
* Changed the search order for Include files for the parser DLL.
* Removed embedded mcpp from Win2k build.
This commit is contained in:
NovaRain
2019-11-14 12:14:46 +08:00
parent 9b63b1886a
commit d93e812f9f
7 changed files with 639 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mcpp_main.c
+10 -2
View File
@@ -250,6 +250,12 @@ static void devide_line( char * out);
static void put_a_line( char * out);
/* Put out the processed line */
static char* second_include_dir = NULL;
void mcpp_add_include_dir(char* dir) /* added - Fakels */
{
second_include_dir = dir;
}
static void init_main( void)
/* Initialize global variables on re-entering. */
{
@@ -274,7 +280,9 @@ int mcpp_lib_main
FILE *fin,
FILE *fout,
const char* in_file,
const char* dir
const char* dir,
const char* def,
const char* include_dir
)
{
const char * stdin_name = "<stdin>";
@@ -303,7 +311,7 @@ int mcpp_lib_main
inc_dirp = &null; /* Initialize to current (null) directory */
cur_fname = cur_fullname = "(predefined)"; /* For predefined macros */
init_defines(); /* Predefine macros */
do_options(dir); /* Command line options */
do_options(dir, def, include_dir, second_include_dir); /* Command line options */
init_sys_macro(); /* Initialize system-specific macros */
add_file( fp_in, NULL, in_file, in_file, FALSE);