fixed Cyrillic encodings

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index bbe82e3a5e01390513f6f625f7330a0aff94b90b..ba49185c321fcb13075708a38e9af3ef8e8be47b 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -130,7 +130,8 @@ GENERICOBJS= \
   ..\generic\$D\tbarsmpl.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
-  ..\generic\$D\treectrl.obj \
+  ..\generic\$D\tipwin.obj \
+  ..\generic\$D\treectlg.obj \
   ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
 
@@ -173,7 +174,8 @@ GENLIBOBJS= \
   tbarsmpl.obj \
   textdlgg.obj \
   tipdlg.obj \
-  treectrl.obj \
+  tipwin.obj \
+  treectlg.obj \
   treelay.obj \
   wizard.obj
 
@@ -189,6 +191,7 @@ COMMONOBJS = \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
+  ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
   ..\common\$D\datetime.obj \
@@ -259,6 +262,7 @@ COMMONOBJS = \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
   ..\common\$D\protocol.obj \
+  ..\common\$D\quantize.obj \
   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
@@ -275,6 +279,7 @@ COMMONOBJS = \
   ..\common\$D\textfile.obj \
   ..\common\$D\timercmn.obj \
   ..\common\$D\tokenzr.obj \
+  ..\common\$D\treebase.obj \
   ..\common\$D\txtstrm.obj \
   ..\common\$D\unzip.obj \
   ..\common\$D\url.obj \
@@ -298,6 +303,7 @@ COMLIBOBJS1 = \
   cmdline.obj \
   cmndata.obj \
   config.obj \
+  cshelp.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
   datetime.obj \
@@ -334,10 +340,10 @@ COMLIBOBJS1 = \
   helpbase.obj \
   http.obj \
   imagall.obj \
-  imagbmp.obj \
-  image.obj
+  imagbmp.obj
 
 COMLIBOBJS2 = \
+  image.obj \
   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \
@@ -364,6 +370,7 @@ COMLIBOBJS2 = \
   prntbase.obj \
   process.obj \
   protocol.obj \
+  quantize.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
@@ -377,11 +384,12 @@ COMLIBOBJS2 = \
   string.obj \
   tbarbase.obj \
   textcmn.obj \
-  textfile.obj \
-  timercmn.obj \
-  tokenzr.obj
+  textfile.obj
 
 COMLIBOBJS3 = \
+  timercmn.obj \
+  tokenzr.obj \
+  treebase.obj \
   txtstrm.obj \
   unzip.obj \
   url.obj \
@@ -627,6 +635,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
+  copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
   copy ..\common\$D\datetime.obj
@@ -664,9 +673,9 @@ $(COMLIBOBJS1):
   copy ..\common\$D\http.obj
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
-  copy ..\common\$D\image.obj
 
 $(COMLIBOBJS2):
+  copy ..\common\$D\image.obj
   copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
@@ -693,6 +702,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
+  copy ..\common\$D\quantize.obj
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
@@ -707,10 +717,11 @@ $(COMLIBOBJS2):
   copy ..\common\$D\tbarbase.obj
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
-  copy ..\common\$D\timercmn.obj
-  copy ..\common\$D\tokenzr.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\timercmn.obj
+  copy ..\common\$D\tokenzr.obj
+  copy ..\common\$D\treebase.obj
   copy ..\common\$D\txtstrm.obj
   copy ..\common\$D\unzip.obj
   copy ..\common\$D\url.obj
@@ -763,7 +774,8 @@ $(GENLIBOBJS):
   copy ..\generic\$D\tbarsmpl.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
-  copy ..\generic\$D\treectrl.obj
+  copy ..\generic\$D\tipwin.obj
+  copy ..\generic\$D\treectlg.obj
   copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
 
@@ -989,20 +1001,16 @@ $(WXDIR)\lib\wx.lib: \
 
 !else
 
-# Update the import library
-$(WXDIR)\lib\wx214.lib: $(OBJECTS)
-    implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
-
 # Update the dynamic link library
-$(WXDIR)\lib\wx214.dll: $(OBJECTS)
+$(WXDIR)\lib\wx22.dll: $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(DUMMYOBJ)
     $(OBJECTS)
-    $(WXDIR)\lib\wx214.def
+    $(WXDIR)\lib\wx22.def
 <<
-    implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
+    implib $(WXDIR)\lib\wx22.lib $(WXDIR)\lib\wx22.def
 
 !endif
 
@@ -1098,7 +1106,7 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
         rd      ..\os2\$D
         del      $(LIBTARGET)
 !if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx214.lib
+        erase /N ..\..\lib\wx22.lib
 !endif
 
 cleanall: clean