Changeset 22114 for branches

Timestamp:

Feb 9, 2016, 12:57:42 PM (10 years ago)

Author:

rousseau

Message:

Work around Open Watcom v1.9 (owcc) bug [apitest]

The 'owcc' compiler front-end of v1.9 does not handle '/' in source
specifications correctly. So the 'subst' macro is used to revert to '\'
for those cases. This seems to have been fixed in v2.0-beta.

Also make Odin Based and Win32 variants use the built Odin instead of
the stock release.

And added a target to start Win32 variants using 'pe'.

Location:

branches/swt/testapp/apitest

Files:

• GNUmakefile (modified) (8 diffs)
• fc.mnu (modified) (1 diff)

branches/swt/testapp/apitest/GNUmakefile

@@ -119 +119 @@
 ODIN32SDK_LIBS+=gdi32.lib
 ODIN32SDK_LIBS:=$(strip $(ODIN32SDK_LIBS))
+
+# Make running ApiTest use the built Odin version instead of the stock release
+#ODIN32SDK_BEGINLIBPATH=..\..\out\os2.x86\debug\stage\bin
+ODIN32SDK_BEGINLIBPATH=..\..\out\os2.x86\release\stage\bin
 
 # This macro is invoked by defined but not yet implemented targets
@@ -326 +330 @@
 
 
+# ! Note: Open Watcom v1.9 bugs (owcc front-end)
+# ! The 'owcc' front-end has several problems passing flags to the compilers.
+# ! For instance, it does not handle the '/' correctly when part of the path
+# ! that specifies a source. The path is discarded and the source is looked for
+# ! in the current directory. Also, using '-fr=<file>' has its problems.
+# ! Because we want to use '/' for the most part, a small hack is done using
+# ! the 'subst' macro on the source specification.
+# ! At least the '/' bug with regard to the source specification seems to be
+# ! fixed as of 'owcc' "Version 2.0 beta Apr 27 2014 22:48:31 (32-bit)".
+
+
 # ------------------------------------------------------------- [ApiTestPm.exe]
 # Build the Pm32 target executable (LX)
 # -----------------------------------------------------------------------------
-$(out)/ApiTestPm.exe: $(src)/ApiTestPm.cpp $(out)/ApiTestPm.res $(module.def)
+$(out)/ApiTestPm.exe: $(subst /,\,$(src)/ApiTestPm.cpp) $(out)/ApiTestPm.res $(module.def)
         @echo [$@]
         $(cc) $(cc.flags.sys) $(cc.flags.pre) $(cc.flags.incdirs) $(cc.flags.libdirs) $(cc.flags.libs) $(cc.flags.post) $(cc.defines) $< -o $@
@@ -347 +362 @@
 # Build the Odin32 target executable (LX)
 # -----------------------------------------------------------------------------
-$(out)/ApiTestOdin.exe: $(src)/ApiTestOdin.cpp $(out)/ApiTestOdin.ors $(module.def)
+$(out)/ApiTestOdin.exe: $(subst /,\,$(src)/ApiTestOdin.cpp) $(out)/ApiTestOdin.ors $(module.def)
         @echo [$@]
         $(cc) $(cc.flags.sys) $(cc.flags.pre) $(cc.flags.incdirs) $(cc.flags.libdirs) $(cc.flags.libs) $(cc.flags.post) $(cc.defines) $< -o $@
@@ -375 +390 @@
 # Build the Win32 target executable (PE)
 # -----------------------------------------------------------------------------
-$(out)/ApiTestWin.exe: $(src)/ApiTestWin.cpp $(out)/ApiTestWin.res $(module.def)
+$(out)/ApiTestWin.exe: $(subst /,\,$(src)/ApiTestWin.cpp) $(out)/ApiTestWin.res $(module.def)
         @echo [$@]
         $(cc) $(cc.flags.sys) $(cc.flags.pre) $(cc.flags.incdirs) $(cc.flags.libdirs) $(cc.flags.libs) $(cc.flags.post) $(cc.defines) $< -o $@ $(module.def)
@@ -419 +434 @@
         @echo [$@]
 #       $(out)\ApiTestOdin.exe
-        cmd /c $(out)\ApiTestOdin.exe
+        cmd /c "set BEGINLIBPATH=$(ODIN32SDK_BEGINLIBPATH)&$(out)\ApiTestOdin.exe"
+
+
+# -------------------------------------------------------------- [run.win32.pe]
+# Run the Win32 variant using pe
+# -----------------------------------------------------------------------------
+# Quirk: *** If Main Window is not destroyed, pe hangs but pec terminates ***
+# Needs more investigation.
+# Also, for both pe and pec, the value for PostQuitMessage() is not present
+# in the 'wParam' field of the message-structure at exit. (wParam is 0)
+# -----------------------------------------------------------------------------
+run.win32.pe: owcc.build.win32
+        @echo [$@]
+#       pe $(out)\ApiTestWin.exe
+        cmd /c "set BEGINLIBPATH=$(ODIN32SDK_BEGINLIBPATH)&pe $(out)\ApiTestWin.exe"
 
 
@@ -434 +463 @@
         @echo [$@]
 #       pec $(out)\ApiTestWin.exe
-        cmd /c pec $(out)\ApiTestWin.exe
+        cmd /c "set BEGINLIBPATH=$(ODIN32SDK_BEGINLIBPATH)&pec $(out)\ApiTestWin.exe"
 
 
@@ -443 +472 @@
         @echo [$@]
         $(out)\ApiTestWin.exe
+
 
 # ----------------------------------------------------------- [gen.tools.flags]
@@ -456 +486 @@
         -gcc --help=common > .flags.gcc.common
 
+
 # --------------------------------------------------------------------- [clean]
 # Cleanup by removing the complete out-directory

branches/swt/testapp/apitest/fc.mnu

@@ -43 +43 @@
 W:      Win32 variant (using pec.exe)
         make run.win32.pec
+.:      Win32 variant (using pe.exe)
+        make run.win32.pe
 -:      --------------------------------
 K:      Win32 variant (using win32k.sys)