X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27e2ed81852088e4317a0b3bc3fd2abae474bac5..21e5527b592198bf3433969313e1c376d12c1305:/src/os2/makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 7748d3f325..9f938f704c 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -112,6 +112,7 @@ GENERICOBJS= \
   ..\generic\$D\logg.obj \
   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
+  ..\generic\$D\plot.obj \
   ..\generic\$D\printps.obj \
   ..\generic\$D\prntdlgg.obj \
   ..\generic\$D\progdlgg.obj \
@@ -148,6 +149,7 @@ GENLIBOBJS= \
   logg.obj \
   numdlgg.obj \
   panelg.obj \
+  plot.obj \
   printps.obj \
   prntdlgg.obj \
   progdlgg.obj \
@@ -225,7 +227,7 @@ COMMONOBJS = \
   ..\common\$D\matrix.obj \
   ..\common\$D\memory.obj \
   ..\common\$D\menucmn.obj \
-  ..\common\$D\mimetype.obj \
+  ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\object.obj \
@@ -324,7 +326,7 @@ COMLIBOBJS2 = \
   matrix.obj \
   memory.obj \
   menucmn.obj \
-  mimetype.obj \
+  mimecmn.obj \
   module.obj \
   mstream.obj \
   object.obj \
@@ -412,6 +414,7 @@ OS2OBJS = \
   ..\os2\$D\menu.obj \
   ..\os2\$D\menuitem.obj \
   ..\os2\$D\metafile.obj \
+  ..\os2\$D\mimetype.obj \
   ..\os2\$D\minifram.obj \
   ..\os2\$D\msgdlg.obj \
   ..\os2\$D\nativdlg.obj \
@@ -490,9 +493,10 @@ OS2LIBOBJS1 = \
   menu.obj \
   menuitem.obj \
   metafile.obj \
-  minifram.obj
+  mimetype.obj
 
 OS2LIBOBJS2 = \
+  minifram.obj \
   msgdlg.obj \
   nativdlg.obj \
   notebook.obj \
@@ -569,7 +573,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
+all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -577,6 +581,14 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 test:   $(OS2DIR)\$D\wave.obj
 test2:  ..\common\Debug\config.obj
 
+$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
+        icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
+
+$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
+        icc @<<
+$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
+<<
+
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
@@ -635,7 +647,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\matrix.obj
   copy ..\common\$D\memory.obj
   copy ..\common\$D\menucmn.obj
-  copy ..\common\$D\mimetype.obj
+  copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\object.obj
@@ -696,6 +708,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\logg.obj
   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
+  copy ..\generic\$D\plot.obj
   copy ..\generic\$D\printps.obj
   copy ..\generic\$D\prntdlgg.obj
   copy ..\generic\$D\progdlgg.obj
@@ -776,9 +789,10 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj
-  copy ..\os2\$D\minifram.obj
+  copy ..\os2\$D\mimetype.obj
 
 $(OS2LIBOBJS2):
+  copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   copy ..\os2\$D\notebook.obj
@@ -945,14 +959,6 @@ $(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx210.lib
 
 !endif
 
-$D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
-        icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
-
-$D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
-        icc @<<
-$(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
-<<
-
 # If taking wxWindows from CVS, setup.h doesn't exist yet.
 $(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h
     copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\os2\setup.bak
@@ -1021,20 +1027,32 @@ clean_xpm:
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
+tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
         del      $(LIBTARGET)
-        erase /N ..\..\lib\wx200.dll
+!if "$(WXMAKINGDLL)" == "1"
         erase /N ..\..\lib\wx200.lib
+!endif
         erase /N $(GENDIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
-        erase /N $(COMMDIR)\\y_tab.c
-        erase /N $(COMMDIR)\lex_yy.c
+        erase /N $(HTMLDIR)\$D\*.obj
         erase /N $(OS2DIR)\$D\*.obj
+        erase /N $(COMMDIR)\y_tab.c
+        erase /N $(COMMDIR)\lex_yy.c
         rd       $(D)
-        rd      ..\generic\$(D)
-        rd      ..\common\$(D)
-        rd      ..\html\$(D)
-        rd      ..\os2\$(D)
+        rd      ..\generic\$D
+        rd      ..\common\$D
+        rd      ..\html\$D
+        rd      ..\os2\$D
 
 cleanall: clean