image handlers moved to separate headers (imagbmp.h etc.) This change is backward...

[wxWidgets.git] / src / os2 / makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index e10f25fdc63d39515333057ecc8241653a3adbcc..0332017631b70cf7b8952115680c156324fd835a 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -52,6 +52,18 @@ COMMDIR=$(WXDIR)\src\common
 OS2DIR=$(WXDIR)\src\os2
 HTMLDIR = $(WXDIR)\src\html
 
+!if [md $(COMMDIR)\$D]
+!endif
+
+!if [md $(OS2DIR)\$D]
+!endif
+
+!if [md $(GENDIR)\$D]
+!endif
+
+!if [md $(HTMLDIR)\$D]
+!endif
+
 {..\generic}.cpp{..\generic\$D}.obj:
     @echo $<
     icc @<<
@@ -208,12 +220,12 @@ COMMONOBJS = \
   ..\common\$D\longlong.obj \
   ..\common\$D\matrix.obj \
   ..\common\$D\memory.obj \
+  ..\common\$D\menucmn.obj \
   ..\common\$D\mimetype.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
-  ..\common\$D\odbc.obj \
   ..\common\$D\paper.obj \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
@@ -307,12 +319,12 @@ COMLIBOBJS2 = \
   longlong.obj \
   matrix.obj \
   memory.obj \
+  menucmn.obj \
   mimetype.obj \
   module.obj \
   mstream.obj \
   object.obj \
   objstrm.obj \
-  odbc.obj \
   paper.obj \
   prntbase.obj \
   process.obj \
@@ -384,6 +396,7 @@ OS2OBJS = \
   ..\os2\$D\frame.obj \
   ..\os2\$D\gauge.obj \
   ..\os2\$D\gdiobj.obj \
+  ..\os2\$D\gdiimage.obj \
   ..\os2\$D\gsocket.obj \
   ..\os2\$D\helpwin.obj \
   ..\os2\$D\icon.obj \
@@ -458,6 +471,7 @@ OS2LIBOBJS1 = \
   fontdlg.obj \
   frame.obj \
   gauge.obj \
+  gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \
   helpwin.obj \
@@ -472,10 +486,10 @@ OS2LIBOBJS1 = \
   metafile.obj \
   minifram.obj \
   msgdlg.obj \
-  nativdlg.obj \
-  notebook.obj
+  nativdlg.obj
 
 OS2LIBOBJS2 = \
+  notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \
@@ -506,6 +520,7 @@ OS2LIBOBJS2 = \
   window.obj
 
 HTMLOBJS = \
+  ..\html\$D\helpctrl.obj \
   ..\html\$D\helpdata.obj \
   ..\html\$D\helpfrm.obj \
   ..\html\$D\htmlcell.obj \
@@ -522,10 +537,10 @@ HTMLOBJS = \
   ..\html\$D\m_list.obj \
   ..\html\$D\m_pre.obj \
   ..\html\$D\m_tables.obj \
-  ..\html\$D\search.obj \
   ..\html\$D\winpars.obj
 
 HTMLLIBOBJS = \
+  helpctrl.obj \
   helpdata.obj \
   helpfrm.obj \
   htmlcell.obj \
@@ -542,14 +557,13 @@ HTMLLIBOBJS = \
   m_list.obj \
   m_pre.obj \
   m_tables.obj \
-  search.obj \
   winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:    $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+all:  $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -557,21 +571,6 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 test:   $(OS2DIR)\$D\wave.obj
 test2:  ..\common\Debug\config.obj
 
-$D:
-    md $D
-
-$(COMMDIR)\$D:
-    md $(COMMDIR)\$D
-
-$(OS2DIR)\$D:
-    md $(OS2DIR)\$D
-
-$(GENDIR)\$D:
-    md $(GENDIR)\$D
-
-$(HTMLDIR)\$D:
-    md $(HTMLDIR)\$D
-
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
@@ -627,12 +626,12 @@ $(COMLIBOBJS2):
   copy ..\common\$D\longlong.obj
   copy ..\common\$D\matrix.obj
   copy ..\common\$D\memory.obj
+  copy ..\common\$D\menucmn.obj
   copy ..\common\$D\mimetype.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\objstrm.obj
-  copy ..\common\$D\odbc.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
@@ -662,9 +661,9 @@ $(COMLIBOBJS2):
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj
   copy ..\common\$D\valtext.obj
-  copy ..\common\$D\variant.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\variant.obj
   copy ..\common\$D\wfstream.obj
   copy ..\common\$D\wincmn.obj
   copy ..\common\$D\wxchar.obj
@@ -706,6 +705,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\treectrl.obj
 
 $(HTMLLIBOBJS):
+  copy ..\html\$D\helpctrl.obj
   copy ..\html\$D\helpdata.obj
   copy ..\html\$D\helpfrm.obj
   copy ..\html\$D\htmlcell.obj
@@ -722,7 +722,6 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\m_list.obj
   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_tables.obj
-  copy ..\html\$D\search.obj
   copy ..\html\$D\winpars.obj
 
 $(OS2LIBOBJS1):
@@ -755,6 +754,7 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\fontdlg.obj
   copy ..\os2\$D\frame.obj
   copy ..\os2\$D\gauge.obj
+  copy ..\os2\$D\gdiimage.obj
   copy ..\os2\$D\gdiobj.obj
   copy ..\os2\$D\gsocket.obj
   copy ..\os2\$D\helpwin.obj
@@ -770,9 +770,9 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
-  copy ..\os2\$D\notebook.obj
 
 $(OS2LIBOBJS2):
+  copy ..\os2\$D\notebook.obj
   copy ..\os2\$D\ownerdrw.obj
   copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj
@@ -972,20 +972,60 @@ $(OBJECTS): $(WXDIR)/include/wx/setup.h
 $(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c
 <<
 
+png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
 clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
-        -erase $(LIBTARGET)
-        -erase ..\..\lib\wx200.dll
-        -erase ..\..\lib\wx200.lib
-        -erase $(GENDIR)\$D\*.obj
-        -erase $(COMMDIR)\$D\*.obj
-        -erase $(COMMDIR)\\y_tab.c
-        -erase $(COMMDIR)\lex_yy.c
-        -erase $(OS2DIR)\$D\*.obj
-        -rmdir $(D)
-        -rmdir ..\generic\$(D)
-        -rmdir ..\common\$(D)
-        -rmdir ..\html\$(D)
-        -rmdir ..\os2\$(D)
+        del      $(LIBTARGET)
+        erase /N ..\..\lib\wx200.dll
+        erase /N ..\..\lib\wx200.lib
+        erase /N $(GENDIR)\$D\*.obj
+        erase /N $(COMMDIR)\$D\*.obj
+        erase /N $(COMMDIR)\\y_tab.c
+        erase /N $(COMMDIR)\lex_yy.c
+        erase /N $(OS2DIR)\$D\*.obj
+        rd       $(D)
+        rd      ..\generic\$(D)
+        rd      ..\common\$(D)
+        rd      ..\html\$(D)
+        rd      ..\os2\$(D)
 
 cleanall: clean