Some more fixes for OS/2.

[wxWidgets.git] / build / bakefiles / regenMakefile.py

diff --git a/build/bakefiles/regenMakefile.py b/build/bakefiles/regenMakefile.py
index 32962e5dba54adf123bc574a251c92ff225c0690..5ecc47351ad8ab44b04e9dcf083c2992db82de07 100755 (executable)
--- a/build/bakefiles/regenMakefile.py
+++ b/build/bakefiles/regenMakefile.py
@@ -16,6 +16,8 @@ DONT_GENERATE = [
     '../../demos/demos.dsw',
     '../../samples/html/html_samples.dsw',
     '../../samples/opengl/opengl_samples.dsw',
+    '../../samples/mobile/mobile_samples.dsw',
+    '../../utils/utils.dsw',
 ]
 
 file = open('Makefile', 'wt')
@@ -31,7 +33,7 @@ MDEPS = common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl opengl.bkl w
 
 DSWFLAGS = -DRUNTIME_LIBS=dynamic -DOFFICIAL_BUILD=0 -DUSE_HTML=1 \\
            -DUSE_OPENGL=1 -DUSE_ODBC=1 -DMONOLITHIC=0 -DUSE_GUI=1 \\
-           -DDEBUG_INFO=default -DDEBUG_FLAG=default
+           -DDEBUG_INFO=default -DDEBUG_FLAG=default -DMSLU=0
 
 COMPAT_TARGETS = ../../src/wxWindows.dsp
 
@@ -118,6 +120,14 @@ addMakefile('../../demos/demos.bkl', {'all':'../../demos'},
             'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
             'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
             })
+addMakefile('../../utils/utils.bkl', {'all':'../../utils'},
+            args={
+            'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
+            'borland':'-DOPTIONS_FILE=../build/msw/config.bcc -DWRITE_OPTIONS_FILE=0',
+            'msvc':'-DOPTIONS_FILE=../build/msw/config.vc -DWRITE_OPTIONS_FILE=0',
+            'mingw':'-DOPTIONS_FILE=../build/msw/config.gcc -DWRITE_OPTIONS_FILE=0',
+            'watcom':'-DOPTIONS_FILE=../build/msw/config.wat -DWRITE_OPTIONS_FILE=0',
+            })
 
 
 CONTRIB_DIR = 1
@@ -133,15 +143,17 @@ def onSubmakefile(type, dirname, names):
     
     if type==SAMPLES_DIR:
         prefix = ''.join(['../' for i in range(0,depth)])
-        dirflags = '-DWXTOPDIR=%s../' % prefix
+        topdirflags = '-DWXTOPDIR=%s../' % prefix
+        srcdirflags = ''
         cfgbase = '%s../build/msw/config.' % prefix
     elif type==CONTRIB_DIR:
-        dirflags = '-DSRCDIR=../../src/%s' % dirname.split('/')[-1]
-        dirflags += ' -DWXTOPDIR=../../../'
+        srcdirflags = '-DSRCDIR=../../src/%s' % dirname.split('/')[-1]
+        topdirflags = ' -DWXTOPDIR=../../../'
         cfgbase = '../../../build/msw/config.'
 
     args = {
-        'all':dirflags,
+        'all':topdirflags,
+        'not_autoconf':srcdirflags,
         'autoconf':'-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4',
         'msvc':'-DOPTIONS_FILE='+cfgbase+'vc -DWRITE_OPTIONS_FILE=0',
         'mingw':'-DOPTIONS_FILE='+cfgbase+'gcc -DWRITE_OPTIONS_FILE=0',
@@ -165,6 +177,8 @@ os.path.walk(os.path.join('..','..','samples'),
              onSubmakefile, SAMPLES_DIR)
 os.path.walk(os.path.join('..','..','demos'),
              onSubmakefile, SAMPLES_DIR)
+os.path.walk(os.path.join('..','..','utils'),
+             onSubmakefile, SAMPLES_DIR)
 os.path.walk(os.path.join('..','..','contrib','build'),
              onSubmakefile, CONTRIB_DIR)
 os.path.walk(os.path.join('..','..','contrib','samples'),