2009-03-12 03:07 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* ChangeLog
    * Added comment to previous entry. (-d1 vs -d2 in owatcom)

  * config/rules.cf
    ! Fixed typo in prev.

  * config/dos/owatcom.cf
  * config/win/owatcom.cf
  * config/linux/owatcom.cf
  * config/os2/owatcom.cf
    % Removed unnecessary -i C compiler options. (pls check,
      I've tested with Windows and applied it to other platforms)
    % Removed DOS cmdline length hack from win/os2.

harbour/ChangeLog

@@ -8,10 +8,27 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-12 03:07 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * ChangeLog
+    * Added comment to previous entry. (-d1 vs -d2 in owatcom)
+
+  * config/rules.cf
+    ! Fixed typo in prev.
+
+  * config/dos/owatcom.cf
+  * config/win/owatcom.cf
+  * config/linux/owatcom.cf
+  * config/os2/owatcom.cf
+    % Removed unnecessary -i C compiler options. (pls check,
+      I've tested with Windows and applied it to other platforms)
+    % Removed DOS cmdline length hack from win/os2.
+
 2009-03-12 02:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * config/dos/owatcom.cf
   * config/linux/owatcom.cf
     + Added support for HB_BUILD_DEBUG=yes.
+      (using -d2 instead of -d1 to be in sync with win,
+      please correct this if wrong)
 
   + config/os2/owatcom.cf
     + Added os2/owatcom build file. OS/2 users please test.

harbour/config/dos/owatcom.cf

@@ -41,7 +41,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -d2
 endif
 
-CPPFLAGS += -i. -i$(TOP)include -i$(TOP)$(ROOT)include -iinclude
+CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
 CPPFLAGS += -i$(HB_INC_COMPILE)
 endif

harbour/config/linux/owatcom.cf

@@ -31,7 +31,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -d2
 endif
 
-CPPFLAGS += -i. -i$(TOP)include -i$(TOP)$(ROOT)include -iinclude
+CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
    CPPFLAGS += -i$(HB_INC_COMPILE)
 endif

harbour/config/os2/owatcom.cf

@@ -26,7 +26,7 @@ CFLAGS += -5 -fp5
 CFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
 endif
 
-CFLAGS += -i. -i$(TOP)include -i$(TOP)$(ROOT)include -iinclude
+CFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
 CFLAGS += -i$(HB_INC_COMPILE)
 endif
@@ -35,10 +35,6 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -d2
 endif
 
-# work arround to DOS command line size limit
-export WPP386 := $(strip $(CFLAGS))
-CFLAGS =
-
 # Note: The empty line directly before 'endef' HAVE TO exist!
 # It causes that the 'echo' command is separated by LF
 define link_file

harbour/config/rules.cf

@@ -39,13 +39,13 @@ endif
 # The rule to compile a C source file.
 ifeq ($(CC_RULE),)
 # Use default rule if architecture/compiler specific rule is not defined
-CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) ($HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(CC_IN) $< $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(CC_IN) $< $(CC_OUT)$(<F:.c=$(OBJ_EXT))
 endif
 
 # The rule to compile a C++ source file.
 ifeq ($(CPP_RULE),)
 # Use default rule if architecture/compiler specific rule is not defined
-CPP_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) ($HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(CC_IN) $< $(CC_OUT)$(<F:.cpp=$(OBJ_EXT))
+CPP_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(CC_IN) $< $(CC_OUT)$(<F:.cpp=$(OBJ_EXT))
 endif
 
 

harbour/config/win/owatcom.cf

@@ -26,7 +26,7 @@ CFLAGS += -5 -fp5
 CFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
 endif
 
-CFLAGS += -i. -i$(TOP)include -i$(TOP)$(ROOT)include -iinclude
+CFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
 CFLAGS += -i$(HB_INC_COMPILE)
 endif
@@ -35,10 +35,6 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -d2
 endif
 
-# work arround to DOS command line size limit
-export WPP386 := $(strip $(CFLAGS))
-CFLAGS =
-
 # Note: The empty line directly before 'endef' HAVE TO exist!
 # It causes that the 'echo' command is separated by LF
 define link_file