Changeset 207

Timestamp:

Jun 26, 2011, 2:28:45 PM (14 years ago)

Author:

rudi

Message:

Cleanup configure script, remove sqlite header template

Location:

trunk

Files:

• configure.cmd (modified) (3 diffs)
• src/3rdparty/sqlite/sqlite.h.in (deleted)

trunk/configure.cmd

@@ -378 +378 @@
 
     G.!Choices.0 = 2
-    G.!Choices.1 = 'Watcom linker bundled with GCC'
-    G.!Choices.2 = 'IBM linker from VisualAge C++'
+    G.!Choices.1 = 'Patched OpenWatcom linker from Netlabs.org'
+    G.!Choices.2 = 'IBM linker from VisualAge C++ 3.08'
     choice = GetChoice('Select the linker type:', 'G.!Choices', -Opt.!UseWlink + 2)
     Opt.!UseWlink = -choice + 2
@@ -414 +414 @@
         call SaySay 'Linker       : IBM ILINK ('Opt.!ILINKPath')'
     else
-        call SaySay 'Linker       : Watcom linker in GCC path'
+        call SaySay 'Linker       : OpenWatcom linker in GCC path'
     call SaySay 'Make Utility : GNU Make ('Opt.!GNUMakePath')'
     say
@@ -467 +467 @@
      */
     call lineout G.!QtCmd, '/* setup the GCC environment */'
-    if Opt.!UseWlink then do
+    if Opt.!UseWlink then
         call lineout G.!QtCmd, '''call'' GCC_PATH''\bin\gccenv.cmd'' GCC_PATH ''WLINK'''
-    end
-    else do
+    else
         call lineout G.!QtCmd, '''call'' GCC_PATH''\bin\gccenv.cmd'' GCC_PATH ''VAC308'''
-    End
     call lineout G.!QtCmd, ''
     call lineout G.!QtCmd, 'call value ''QMAKESPEC'', QMAKESPEC, ''OS2ENVIRONMENT'''