X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..00dd3b1897bd74276234f449f68e3f0805eb77dc:/src/os2/makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index e5001f5cfc..f1cda8a892 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -114,7 +114,6 @@ GENERICOBJS= \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\imaglist.obj \
   ..\generic\$D\laywin.obj \
-  ..\generic\$D\listctrl.obj \
   ..\generic\$D\logg.obj \
   ..\generic\$D\mdig.obj \
   ..\generic\$D\numdlgg.obj \
@@ -135,7 +134,6 @@ GENERICOBJS= \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
   ..\generic\$D\tipwin.obj \
-  ..\generic\$D\treectlg.obj \
   ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
 
@@ -161,7 +159,6 @@ GENLIBOBJS= \
   helphtml.obj \
   imaglist.obj \
   laywin.obj \
-  listctrl.obj \
   logg.obj \
   mdig.obj \
   numdlgg.obj \
@@ -182,7 +179,6 @@ GENLIBOBJS= \
   textdlgg.obj \
   tipdlg.obj \
   tipwin.obj \
-  treectlg.obj \
   treelay.obj \
   wizard.obj
 
@@ -510,6 +506,7 @@ OS2OBJS = \
   ..\os2\$D\iniconf.obj \
   ..\os2\$D\joystick.obj \
   ..\os2\$D\listbox.obj \
+  ..\os2\$D\listctrl.obj \
   ..\os2\$D\main.obj \
   ..\os2\$D\menu.obj \
   ..\os2\$D\menuitem.obj \
@@ -543,6 +540,7 @@ OS2OBJS = \
   ..\os2\$D\toolbar.obj \
   ..\os2\$D\tooltip.obj \
   ..\os2\$D\toplevel.obj \
+  ..\os2\$D\treectrl.obj \
   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \
@@ -589,13 +587,14 @@ OS2LIBOBJS1 = \
   iniconf.obj \
   joystick.obj \
   listbox.obj \
+  listctrl.obj \
   main.obj \
   menu.obj \
   menuitem.obj \
-  metafile.obj \
-  mimetype.obj
+  metafile.obj
 
 OS2LIBOBJS2 = \
+  mimetype.obj \
   msgdlg.obj \
   nativdlg.obj \
   notebook.obj \
@@ -624,6 +623,7 @@ OS2LIBOBJS2 = \
   toolbar.obj \
   tooltip.obj \
   toplevel.obj \
+  treectrl.obj \
   utils.obj \
   utilsexc.obj \
   wave.obj \
@@ -856,7 +856,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\imaglist.obj
   copy ..\generic\$D\laywin.obj
-  copy ..\generic\$D\listctrl.obj
   copy ..\generic\$D\logg.obj
   copy ..\generic\$D\mdig.obj
   copy ..\generic\$D\numdlgg.obj
@@ -877,7 +876,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
   copy ..\generic\$D\tipwin.obj
-  copy ..\generic\$D\treectlg.obj
   copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
 
@@ -944,13 +942,14 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\iniconf.obj
   copy ..\os2\$D\joystick.obj
   copy ..\os2\$D\listbox.obj
+  copy ..\os2\$D\listctrl.obj
   copy ..\os2\$D\main.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj
-  copy ..\os2\$D\mimetype.obj
 
 $(OS2LIBOBJS2):
+  copy ..\os2\$D\mimetype.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   copy ..\os2\$D\notebook.obj
@@ -979,6 +978,7 @@ $(OS2LIBOBJS2):
   copy ..\os2\$D\toolbar.obj
   copy ..\os2\$D\tooltip.obj
   copy ..\os2\$D\toplevel.obj
+  copy ..\os2\$D\treectrl.obj
   copy ..\os2\$D\utils.obj
   copy ..\os2\$D\utilsexc.obj
   copy ..\os2\$D\wave.obj
@@ -1113,15 +1113,15 @@ $(WXDIR)\lib\wx.lib: \
 !else
 
 # Update the dynamic link library
-$(WXDIR)\lib\wx23.dll: $(OBJECTS)
+$(WXDIR)\lib\wx25.dll: $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(DUMMYOBJ)
     $(OBJECTS)
-    $(WXDIR)\src\os2\wx23.def
+    $(WXDIR)\src\os2\wx25.def
 <<
-    implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
+    implib $(WXDIR)\lib\wx25.lib $(WXDIR)\src\os2\wx25.def
 
 !endif
 
@@ -1200,7 +1200,7 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff
         rd      ..\os2\$D
         del      $(LIBTARGET)
 !if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx23.lib
+        erase /N ..\..\lib\wx25.lib
 !endif
         erase /N $(COMMDIR)\y_tab.c
         erase /N $(COMMDIR)\lex_yy.c