Anubis / Anubis

Commit c52fbde07968a81308648ade9ad4b58d53f616ae

Authored by Cédric RICARD
1 parent 41aedf5e

Changed max_already_included value to 1024 

Disabled SQLAPI by default
Showing 3 changed files with 11 additions and 21 deletions   Show diff stats
Inline Side-by-side
anubis_dev/compiler/SConstruct
  Show/Hide comments   View file @c52fbde
... ... @@ -37,16 +37,6 @@ if platform.system() == 'Windows':
37 37 #additionalLibs.append('shell32.lib')
38 38 env.Append(LIBS=['ws2_32', 'shell32'])
39 39 # env.Append(LINKFLAGS = ' /subsystem:console /incremental:no /machine:I386 ')
40   - env['CXXCOM'] = env['CXXCOM'].replace('$SOURCES', '${SOURCES.abspath}')
41   - env['CCCOM'] = env['CCCOM'].replace('$SOURCES', '${SOURCES.abspath}')
42   - env.Append(CCFLAGS = ' -c -Wall -Wstrict-prototypes -m32')
43   - env.Append(LINKFLAGS = ' -m32')
44   - if debug:
45   - env.Append(CCFLAGS = ' -g3 -O0')
46   - else:
47   - env.Append(CCFLAGS = ' -O2')
48   - if static:
49   - env.Append(LINKFLAGS = '-static')
50 40 else:
51 41 if platform.system() == 'Linux':
52 42 env.Append(CPPDEFINES = {'_LINUX_': None})
... ... @@ -56,17 +46,17 @@ else:
56 46 #env['CXXCOM'] = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM ${SOURCES.abspath}'
57 47 env['CXXCOM'] = env['CXXCOM'].replace('$SOURCES', '${SOURCES.abspath}')
58 48 env['CCCOM'] = env['CCCOM'].replace('$SOURCES', '${SOURCES.abspath}')
59   -
60   - env.Append(CCFLAGS = ' -c -Wall -Wstrict-prototypes -m32')
61   - env.Append(LINKFLAGS = ' -m32')
62   - if debug:
63   - env.Append(CCFLAGS = ' -g3 -O0')
64   - else:
65   - env.Append(CCFLAGS = ' -O2')
66   - if static:
67   - env.Append(LINKFLAGS = '-static')
68 49 compiler_output_name = 'anubis_with_symbol'
69 50  
  51 +env.Append(CCFLAGS = ' -c -Wall -Wstrict-prototypes -m32')
  52 +env.Append(LINKFLAGS = ' -m32')
  53 +if debug:
  54 + env.Append(CCFLAGS = ' -g3 -O0')
  55 +else:
  56 + env.Append(CCFLAGS = ' -O2')
  57 +if static:
  58 + env.Append(LINKFLAGS = '-static')
  59 +
70 60  
71 61 env['DEVDIR'] = os.path.normpath(os.path.join('..'))
72 62 env['BASEDIR'] = os.path.normpath(os.path.join(env['DEVDIR'], '..'))
... ...
anubis_dev/compiler/src/compil.h
  Show/Hide comments   View file @c52fbde
... ... @@ -35,7 +35,7 @@ extern "C" {
35 35 #define reallocz(p,n) reallocz1(p,n)
36 36  
37 37  
38   -#define max_already_included (255)
  38 +#define max_already_included (1024)
39 39  
40 40  
41 41 /* general */
... ...
anubis_dev/vm/SConstruct
  Show/Hide comments   View file @c52fbde
... ... @@ -5,7 +5,7 @@ opts = Variables('DefaultOptions.py')
5 5 opts.Add(BoolVariable('DEBUG', 'Set to 1 to build with debug symbols', 0))
6 6 opts.Add(BoolVariable('GUI', 'Set to 1 to build with graphical interface support', 1))
7 7 opts.Add(BoolVariable('SSL', 'Set to 1 to build with SSL support', 1))
8   -opts.Add(BoolVariable('SQLAPI', 'Set to 1 to build with SQLAPI support', 1))
  8 +opts.Add(BoolVariable('SQLAPI', 'Set to 1 to build with SQLAPI support', 0))
9 9 opts.Add(EnumVariable('SQLITE_THREADSAFE', 'Threading mode for Sqlite', '1', allowed_values=('0', '1', '2')))
10 10 opts.Add('CC', 'The C compiler')
11 11 opts.Add('CXX', 'The C++ compiler')
... ...