projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not #include an header where a forward declaration suffixes. Do not
[wxWidgets.git]
/
src
/
os2
/
makefile.va
diff --git
a/src/os2/makefile.va
b/src/os2/makefile.va
index 514668cd37af177648ff25af4f45653c41eb20e5..f1cda8a892a8892b4c00392d588d57bbb2e26016 100644
(file)
--- 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\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 \
..\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\textdlgg.obj \
..\generic\$D\tipdlg.obj \
..\generic\$D\tipwin.obj \
- ..\generic\$D\treectlg.obj \
..\generic\$D\treelay.obj \
..\generic\$D\wizard.obj
..\generic\$D\treelay.obj \
..\generic\$D\wizard.obj
@@
-161,7
+159,6
@@
GENLIBOBJS= \
helphtml.obj \
imaglist.obj \
laywin.obj \
helphtml.obj \
imaglist.obj \
laywin.obj \
- listctrl.obj \
logg.obj \
mdig.obj \
numdlgg.obj \
logg.obj \
mdig.obj \
numdlgg.obj \
@@
-182,7
+179,6
@@
GENLIBOBJS= \
textdlgg.obj \
tipdlg.obj \
tipwin.obj \
textdlgg.obj \
tipdlg.obj \
tipwin.obj \
- treectlg.obj \
treelay.obj \
wizard.obj
treelay.obj \
wizard.obj
@@
-510,6
+506,7
@@
OS2OBJS = \
..\os2\$D\iniconf.obj \
..\os2\$D\joystick.obj \
..\os2\$D\listbox.obj \
..\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 \
..\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\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 \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
@@
-589,13
+587,14
@@
OS2LIBOBJS1 = \
iniconf.obj \
joystick.obj \
listbox.obj \
iniconf.obj \
joystick.obj \
listbox.obj \
+ listctrl.obj \
main.obj \
menu.obj \
menuitem.obj \
main.obj \
menu.obj \
menuitem.obj \
- metafile.obj \
- mimetype.obj
+ metafile.obj
OS2LIBOBJS2 = \
OS2LIBOBJS2 = \
+ mimetype.obj \
msgdlg.obj \
nativdlg.obj \
notebook.obj \
msgdlg.obj \
nativdlg.obj \
notebook.obj \
@@
-624,6
+623,7
@@
OS2LIBOBJS2 = \
toolbar.obj \
tooltip.obj \
toplevel.obj \
toolbar.obj \
tooltip.obj \
toplevel.obj \
+ treectrl.obj \
utils.obj \
utilsexc.obj \
wave.obj \
utils.obj \
utilsexc.obj \
wave.obj \
@@
-646,7
+646,6
@@
HTMLOBJS = \
..\html\$D\m_layout.obj \
..\html\$D\m_links.obj \
..\html\$D\m_list.obj \
..\html\$D\m_layout.obj \
..\html\$D\m_links.obj \
..\html\$D\m_list.obj \
- ..\html\$D\m_meta.obj \
..\html\$D\m_pre.obj \
..\html\$D\m_style.obj \
..\html\$D\m_tables.obj \
..\html\$D\m_pre.obj \
..\html\$D\m_style.obj \
..\html\$D\m_tables.obj \
@@
-669,7
+668,6
@@
HTMLLIBOBJS = \
m_layout.obj \
m_links.obj \
m_list.obj \
m_layout.obj \
m_links.obj \
m_list.obj \
- m_meta.obj \
m_pre.obj \
m_style.obj \
m_tables.obj \
m_pre.obj \
m_style.obj \
m_tables.obj \
@@
-858,7
+856,6
@@
$(GENLIBOBJS):
copy ..\generic\$D\helphtml.obj
copy ..\generic\$D\imaglist.obj
copy ..\generic\$D\laywin.obj
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
copy ..\generic\$D\logg.obj
copy ..\generic\$D\mdig.obj
copy ..\generic\$D\numdlgg.obj
@@
-879,7
+876,6
@@
$(GENLIBOBJS):
copy ..\generic\$D\textdlgg.obj
copy ..\generic\$D\tipdlg.obj
copy ..\generic\$D\tipwin.obj
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
copy ..\generic\$D\treelay.obj
copy ..\generic\$D\wizard.obj
@@
-900,7
+896,6
@@
$(HTMLLIBOBJS):
copy ..\html\$D\m_layout.obj
copy ..\html\$D\m_links.obj
copy ..\html\$D\m_list.obj
copy ..\html\$D\m_layout.obj
copy ..\html\$D\m_links.obj
copy ..\html\$D\m_list.obj
- copy ..\html\$D\m_meta.obj
copy ..\html\$D\m_pre.obj
copy ..\html\$D\m_style.obj
copy ..\html\$D\m_tables.obj
copy ..\html\$D\m_pre.obj
copy ..\html\$D\m_style.obj
copy ..\html\$D\m_tables.obj
@@
-947,13
+942,14
@@
$(OS2LIBOBJS1):
copy ..\os2\$D\iniconf.obj
copy ..\os2\$D\joystick.obj
copy ..\os2\$D\listbox.obj
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\main.obj
copy ..\os2\$D\menu.obj
copy ..\os2\$D\menuitem.obj
copy ..\os2\$D\metafile.obj
- copy ..\os2\$D\mimetype.obj
$(OS2LIBOBJS2):
$(OS2LIBOBJS2):
+ copy ..\os2\$D\mimetype.obj
copy ..\os2\$D\msgdlg.obj
copy ..\os2\$D\nativdlg.obj
copy ..\os2\$D\notebook.obj
copy ..\os2\$D\msgdlg.obj
copy ..\os2\$D\nativdlg.obj
copy ..\os2\$D\notebook.obj
@@
-982,6
+978,7
@@
$(OS2LIBOBJS2):
copy ..\os2\$D\toolbar.obj
copy ..\os2\$D\tooltip.obj
copy ..\os2\$D\toplevel.obj
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
copy ..\os2\$D\utils.obj
copy ..\os2\$D\utilsexc.obj
copy ..\os2\$D\wave.obj
@@
-1116,15
+1113,15
@@
$(WXDIR)\lib\wx.lib: \
!else
# Update the dynamic link library
!else
# Update the dynamic link library
-$(WXDIR)\lib\wx2
3
.dll: $(OBJECTS)
+$(WXDIR)\lib\wx2
5
.dll: $(OBJECTS)
icc @<<
/B" $(LINKFLAGS)" /Fe$@
$(LIBS)
$(DUMMYOBJ)
$(OBJECTS)
icc @<<
/B" $(LINKFLAGS)" /Fe$@
$(LIBS)
$(DUMMYOBJ)
$(OBJECTS)
- $(WXDIR)\src\os2\wx2
3
.def
+ $(WXDIR)\src\os2\wx2
5
.def
<<
<<
- implib $(WXDIR)\lib\wx2
3.lib $(WXDIR)\src\os2\wx23
.def
+ implib $(WXDIR)\lib\wx2
5.lib $(WXDIR)\src\os2\wx25
.def
!endif
!endif
@@
-1203,7
+1200,7
@@
clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_tiff
rd ..\os2\$D
del $(LIBTARGET)
!if "$(WXMAKINGDLL)" == "1"
rd ..\os2\$D
del $(LIBTARGET)
!if "$(WXMAKINGDLL)" == "1"
- erase /N ..\..\lib\wx2
3
.lib
+ erase /N ..\..\lib\wx2
5
.lib
!endif
erase /N $(COMMDIR)\y_tab.c
erase /N $(COMMDIR)\lex_yy.c
!endif
erase /N $(COMMDIR)\y_tab.c
erase /N $(COMMDIR)\lex_yy.c