X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e9140114eb7222ccca32d15d5a36a4e30f20b6f..f00f657d37e530c55d5e98fac2477b477a6f1d36:/src/os2/makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 77a4b54aff..63af28dcc4 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -192,9 +192,9 @@ NONESSENTIALOBJS= \
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
-  ..\common\$D\bmpbase.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
+  ..\common\$D\clntdata.obj \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\cmdproc.obj \
@@ -291,6 +291,7 @@ COMMONOBJS = \
   ..\common\$D\serbase.obj \
   ..\common\$D\sizer.obj \
   ..\common\$D\socket.obj \
+  ..\common\$D\statbar.obj \
   ..\common\$D\strconv.obj \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \
@@ -321,9 +322,9 @@ COMMONOBJS = \
 
 COMLIBOBJS1 = \
   appcmn.obj \
-  bmpbase.obj \
   choiccmn.obj \
   clipcmn.obj \
+  clntdata.obj \
   cmdline.obj \
   cmndata.obj \
   cmdproc.obj \
@@ -362,10 +363,10 @@ COMLIBOBJS1 = \
   framecmn.obj \
   fs_inet.obj \
   fs_mem.obj \
-  fs_zip.obj \
-  ftp.obj
+  fs_zip.obj
 
 COMLIBOBJS2 = \
+  ftp.obj \
   gaugecmn.obj \
   gdicmn.obj \
   geometry.obj \
@@ -406,10 +407,10 @@ COMLIBOBJS2 = \
   process.obj \
   protocol.obj \
   quantize.obj \
-  radiocmn.obj \
-  regex.obj
+  radiocmn.obj
 
 COMLIBOBJS3 = \
+  regex.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
@@ -418,6 +419,7 @@ COMLIBOBJS3 = \
   serbase.obj \
   sizer.obj \
   socket.obj \
+  statbar.obj \
   strconv.obj \
   stream.obj \
   string.obj \
@@ -660,7 +662,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
+all:  $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -668,6 +670,13 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 test:   $(OS2DIR)\$D\wave.obj
 test2:  ..\common\Debug\config.obj
 
+# 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\setup0.h "$(WXDIR)"\include\wx\os2\setup.h
+
+$(WXDIR)\include\wx\setup.h: $(WXDIR)\include\wx\os2\setup.h
+    copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\setup.h
+
 $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
 
@@ -676,9 +685,9 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
-  copy ..\common\$D\bmpbase.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
+  copy ..\common\$D\clntdata.obj
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\cmdproc.obj
@@ -718,9 +727,9 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fs_inet.obj
   copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
-  copy ..\common\$D\ftp.obj
 
 $(COMLIBOBJS2):
+  copy ..\common\$D\ftp.obj
   copy ..\common\$D\gaugecmn.obj
   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\geometry.obj
@@ -762,9 +771,9 @@ $(COMLIBOBJS2):
   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj
   copy ..\common\$D\radiocmn.obj
-  copy ..\common\$D\regex.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\regex.obj
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
@@ -773,6 +782,7 @@ $(COMLIBOBJS3):
   copy ..\common\$D\serbase.obj
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
+  copy ..\common\$D\statbar.obj
   copy ..\common\$D\strconv.obj
   copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj
@@ -1083,11 +1093,6 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS)
 
 !endif
 
-# 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
-    copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h
-
 ..\common\$D\extended.obj:     ..\common\extended.c
         icc @<<
 $(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c