wxMGL Watcom makefiles fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mgl/makefile.wat b/src/mgl/makefile.wat
index 6f0a6912edf3b2a63091566481c569670373522f..faaf8da49317d9febe13470557e4e6475065fec4 100644 (file)
--- a/src/mgl/makefile.wat
+++ b/src/mgl/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
 #!/binb/wmake.exe
 

-# This file was automatically generated by tmake at 16:57, 2002/01/15
+# This file was automatically generated by tmake at 11:57, 2002/01/17

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #


@@ -142,7 +142,6 @@ COMMONOBJS = &
        hash.obj &
        helpbase.obj &
        http.obj &
        hash.obj &
        helpbase.obj &
        http.obj &

-       iffdecod.obj &

        imagall.obj &
        imagbmp.obj &
        image.obj &
        imagall.obj &
        imagbmp.obj &
        image.obj &


@@ -302,7 +301,16 @@ HTMLOBJS = helpctrl.obj &
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
 

-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(WXDIR)\include\wx\mgl\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\mgl\setup.h $@

 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc


@@ -675,9 +683,6 @@ helpbase.obj:     $(COMMDIR)\helpbase.cpp
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 http.obj:     $(COMMDIR)\http.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

-iffdecod.obj:     $(COMMDIR)\iffdecod.cpp
-  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
-

 imagall.obj:     $(COMMDIR)\imagall.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
 imagall.obj:     $(COMMDIR)\imagall.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 

diff --git a/src/mgl/makewat.env b/src/mgl/makewat.env
index 2a552d4ca9fa0764ea6c4523dc3e865091d9956d..c80a02fb60acc2f62c6d97e7c5e99d508b9499d4 100644 (file)
--- a/src/mgl/makewat.env
+++ b/src/mgl/makewat.env
@@ -38,9 +38,11 @@ PRECOMP     = /fh=$(WXDIR)\src\mgl\watcom.pch
 !ifeq FINAL 0
 DEBUGFLAGS     = /D__WXDEBUG__ /d2
 DEBUGINFO   = debug all
 !ifeq FINAL 0
 DEBUGFLAGS     = /D__WXDEBUG__ /d2
 DEBUGINFO   = debug all

+ARCHINCDIR=$(WXDIR)\lib\mgld

 !else
 DEBUGFLAGS     =
 DEBUGINFO   =
 !else
 DEBUGFLAGS     =
 DEBUGINFO   =

+ARCHINCDIR=$(WXDIR)\lib\mgl

 !endif
 
 LEVEL       = 386
 !endif
 
 LEVEL       = 386


@@ -56,7 +58,7 @@ MAXDATA     =
 STACK       = option stack=200k
 LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &
       $(MGLLIBDIR)\dos4gw\pm.lib $(MGLLIBDIR)\mgl.lib $(MGLLIBDIR)\mglcpp.lib  
 STACK       = option stack=200k
 LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &
       $(MGLLIBDIR)\dos4gw\pm.lib $(MGLLIBDIR)\mgl.lib $(MGLLIBDIR)\mglcpp.lib  

-IFLAGS      = -i=$(WXDIR)\lib\mgl;$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\dos;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff
+IFLAGS      = -i=$(ARCHINCDIR);$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\dos;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff

 ;$(MGLROOT)\include
 
 # Here are some possible optimization flags:
 ;$(MGLROOT)\include
 
 # Here are some possible optimization flags: