projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change demo to not try to drop the table when it thinks it is creating it for the...
[wxWidgets.git]
/
src
/
os2
/
makefile.va
diff --git
a/src/os2/makefile.va
b/src/os2/makefile.va
index 190951eaeda74d3ff6fde533aa8f1d7b3edf1a5c..aa7be11a3fb23c53187695f3d94f1c4c6223b08b 100644
(file)
--- a/
src/os2/makefile.va
+++ b/
src/os2/makefile.va
@@
-101,6
+101,7
@@
GENERICOBJS= \
..\generic\$D\choicdgg.obj \
..\generic\$D\colrdlgg.obj \
..\generic\$D\dcpsg.obj \
..\generic\$D\choicdgg.obj \
..\generic\$D\colrdlgg.obj \
..\generic\$D\dcpsg.obj \
+ ..\generic\$D\dirctrlg.obj \
..\generic\$D\dragimgg.obj \
..\generic\$D\fontdlgg.obj \
..\generic\$D\grid.obj \
..\generic\$D\dragimgg.obj \
..\generic\$D\fontdlgg.obj \
..\generic\$D\grid.obj \
@@
-115,7
+116,6
@@
GENERICOBJS= \
..\generic\$D\logg.obj \
..\generic\$D\numdlgg.obj \
..\generic\$D\panelg.obj \
..\generic\$D\logg.obj \
..\generic\$D\numdlgg.obj \
..\generic\$D\panelg.obj \
- ..\generic\$D\plot.obj \
..\generic\$D\printps.obj \
..\generic\$D\prntdlgg.obj \
..\generic\$D\progdlgg.obj \
..\generic\$D\printps.obj \
..\generic\$D\prntdlgg.obj \
..\generic\$D\progdlgg.obj \
@@
-130,7
+130,8
@@
GENERICOBJS= \
..\generic\$D\tbarsmpl.obj \
..\generic\$D\textdlgg.obj \
..\generic\$D\tipdlg.obj \
..\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
..\generic\$D\treelay.obj \
..\generic\$D\wizard.obj
@@
-144,6
+145,7
@@
GENLIBOBJS= \
choicdgg.obj \
colrdlgg.obj \
dcpsg.obj \
choicdgg.obj \
colrdlgg.obj \
dcpsg.obj \
+ dirctrlg.obj \
dragimgg.obj \
fontdlgg.obj \
grid.obj \
dragimgg.obj \
fontdlgg.obj \
grid.obj \
@@
-158,7
+160,6
@@
GENLIBOBJS= \
logg.obj \
numdlgg.obj \
panelg.obj \
logg.obj \
numdlgg.obj \
panelg.obj \
- plot.obj \
printps.obj \
prntdlgg.obj \
progdlgg.obj \
printps.obj \
prntdlgg.obj \
progdlgg.obj \
@@
-173,7
+174,8
@@
GENLIBOBJS= \
tbarsmpl.obj \
textdlgg.obj \
tipdlg.obj \
tbarsmpl.obj \
textdlgg.obj \
tipdlg.obj \
- treectrl.obj \
+ tipwin.obj \
+ treectlg.obj \
treelay.obj \
wizard.obj
treelay.obj \
wizard.obj
@@
-189,6
+191,7
@@
COMMONOBJS = \
..\common\$D\cmdline.obj \
..\common\$D\cmndata.obj \
..\common\$D\config.obj \
..\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 \
..\common\$D\ctrlcmn.obj \
..\common\$D\ctrlsub.obj \
..\common\$D\datetime.obj \
@@
-206,6
+209,7
@@
COMMONOBJS = \
..\common\$D\docview.obj \
..\common\$D\dynarray.obj \
..\common\$D\dynlib.obj \
..\common\$D\docview.obj \
..\common\$D\dynarray.obj \
..\common\$D\dynlib.obj \
+ ..\common\$D\effects.obj \
..\common\$D\encconv.obj \
..\common\$D\event.obj \
..\common\$D\extended.obj \
..\common\$D\encconv.obj \
..\common\$D\event.obj \
..\common\$D\extended.obj \
@@
-213,6
+217,7
@@
COMMONOBJS = \
..\common\$D\file.obj \
..\common\$D\fileconf.obj \
..\common\$D\filefn.obj \
..\common\$D\file.obj \
..\common\$D\fileconf.obj \
..\common\$D\filefn.obj \
+ ..\common\$D\filename.obj \
..\common\$D\filesys.obj \
..\common\$D\fontcmn.obj \
..\common\$D\fontmap.obj \
..\common\$D\filesys.obj \
..\common\$D\fontcmn.obj \
..\common\$D\fontmap.obj \
@@
-259,6
+264,7
@@
COMMONOBJS = \
..\common\$D\prntbase.obj \
..\common\$D\process.obj \
..\common\$D\protocol.obj \
..\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 \
..\common\$D\resource.obj \
..\common\$D\sckaddr.obj \
..\common\$D\sckfile.obj \
@@
-275,6
+281,7
@@
COMMONOBJS = \
..\common\$D\textfile.obj \
..\common\$D\timercmn.obj \
..\common\$D\tokenzr.obj \
..\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 \
..\common\$D\txtstrm.obj \
..\common\$D\unzip.obj \
..\common\$D\url.obj \
@@
-298,6
+305,7
@@
COMLIBOBJS1 = \
cmdline.obj \
cmndata.obj \
config.obj \
cmdline.obj \
cmndata.obj \
config.obj \
+ cshelp.obj \
ctrlcmn.obj \
ctrlsub.obj \
datetime.obj \
ctrlcmn.obj \
ctrlsub.obj \
datetime.obj \
@@
-312,6
+320,7
@@
COMLIBOBJS1 = \
docview.obj \
dynarray.obj \
dynlib.obj \
docview.obj \
dynarray.obj \
dynlib.obj \
+ effects.obj \
encconv.obj \
event.obj \
extended.obj \
encconv.obj \
event.obj \
extended.obj \
@@
-319,6
+328,7
@@
COMLIBOBJS1 = \
file.obj \
fileconf.obj \
filefn.obj \
file.obj \
fileconf.obj \
filefn.obj \
+ filename.obj \
filesys.obj \
fontcmn.obj \
fontmap.obj \
filesys.obj \
fontcmn.obj \
fontmap.obj \
@@
-332,12
+342,12
@@
COMLIBOBJS1 = \
gifdecod.obj \
hash.obj \
helpbase.obj \
gifdecod.obj \
hash.obj \
helpbase.obj \
- http.obj \
- imagall.obj \
- imagbmp.obj \
- image.obj
+ http.obj
COMLIBOBJS2 = \
COMLIBOBJS2 = \
+ imagall.obj \
+ imagbmp.obj \
+ image.obj \
imaggif.obj \
imagjpeg.obj \
imagpcx.obj \
imaggif.obj \
imagjpeg.obj \
imagpcx.obj \
@@
-364,6
+374,7
@@
COMLIBOBJS2 = \
prntbase.obj \
process.obj \
protocol.obj \
prntbase.obj \
process.obj \
protocol.obj \
+ quantize.obj \
resource.obj \
sckaddr.obj \
sckfile.obj \
resource.obj \
sckaddr.obj \
sckfile.obj \
@@
-375,13
+386,14
@@
COMLIBOBJS2 = \
strconv.obj \
stream.obj \
string.obj \
strconv.obj \
stream.obj \
string.obj \
- tbarbase.obj \
+ tbarbase.obj
+
+COMLIBOBJS3 = \
textcmn.obj \
textfile.obj \
timercmn.obj \
textcmn.obj \
textfile.obj \
timercmn.obj \
- tokenzr.obj
-
-COMLIBOBJS3 = \
+ tokenzr.obj \
+ treebase.obj \
txtstrm.obj \
unzip.obj \
url.obj \
txtstrm.obj \
unzip.obj \
url.obj \
@@
-421,6
+433,7
@@
OS2OBJS = \
..\os2\$D\dcprint.obj \
..\os2\$D\dcscreen.obj \
..\os2\$D\dialog.obj \
..\os2\$D\dcprint.obj \
..\os2\$D\dcscreen.obj \
..\os2\$D\dialog.obj \
+ ..\os2\$D\dir.obj \
..\os2\$D\dirdlg.obj \
..\os2\$D\dnd.obj \
..\os2\$D\filedlg.obj \
..\os2\$D\dirdlg.obj \
..\os2\$D\dnd.obj \
..\os2\$D\filedlg.obj \
@@
-430,8
+443,8
@@
OS2OBJS = \
..\os2\$D\fontutil.obj \
..\os2\$D\frame.obj \
..\os2\$D\gauge.obj \
..\os2\$D\fontutil.obj \
..\os2\$D\frame.obj \
..\os2\$D\gauge.obj \
- ..\os2\$D\gdiobj.obj \
..\os2\$D\gdiimage.obj \
..\os2\$D\gdiimage.obj \
+ ..\os2\$D\gdiobj.obj \
..\os2\$D\gsocket.obj \
..\os2\$D\helpwin.obj \
..\os2\$D\icon.obj \
..\os2\$D\gsocket.obj \
..\os2\$D\helpwin.obj \
..\os2\$D\icon.obj \
@@
-475,7
+488,8
@@
OS2OBJS = \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
..\os2\$D\utils.obj \
..\os2\$D\utilsexc.obj \
..\os2\$D\wave.obj \
- ..\os2\$D\window.obj
+ ..\os2\$D\window.obj \
+ ..\os2\$D\xpmhand.obj
OS2LIBOBJS1 = \
accel.obj \
OS2LIBOBJS1 = \
accel.obj \
@@
-500,6
+514,7
@@
OS2LIBOBJS1 = \
dcprint.obj \
dcscreen.obj \
dialog.obj \
dcprint.obj \
dcscreen.obj \
dialog.obj \
+ dir.obj \
dirdlg.obj \
dnd.obj \
filedlg.obj \
dirdlg.obj \
dnd.obj \
filedlg.obj \
@@
-521,10
+536,10
@@
OS2LIBOBJS1 = \
mdi.obj \
menu.obj \
menuitem.obj \
mdi.obj \
menu.obj \
menuitem.obj \
- metafile.obj \
- mimetype.obj
+ metafile.obj
OS2LIBOBJS2 = \
OS2LIBOBJS2 = \
+ mimetype.obj \
minifram.obj \
msgdlg.obj \
nativdlg.obj \
minifram.obj \
msgdlg.obj \
nativdlg.obj \
@@
-556,7
+571,8
@@
OS2LIBOBJS2 = \
utils.obj \
utilsexc.obj \
wave.obj \
utils.obj \
utilsexc.obj \
wave.obj \
- window.obj
+ window.obj \
+ xpmhand.obj
HTMLOBJS = \
..\html\$D\helpctrl.obj \
HTMLOBJS = \
..\html\$D\helpctrl.obj \
@@
-606,7
+622,7
@@
HTMLLIBOBJS = \
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
# Normal, static library
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
# Normal, static library
-all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET)
png zlib
jpeg xpm tiff $(LIBTARGET)
+all: $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET)
zlib png
jpeg xpm tiff $(LIBTARGET)
dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
@@
-627,6
+643,7
@@
$(COMLIBOBJS1):
copy ..\common\$D\cmdline.obj
copy ..\common\$D\cmndata.obj
copy ..\common\$D\config.obj
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
copy ..\common\$D\ctrlcmn.obj
copy ..\common\$D\ctrlsub.obj
copy ..\common\$D\datetime.obj
@@
-641,6
+658,7
@@
$(COMLIBOBJS1):
copy ..\common\$D\docview.obj
copy ..\common\$D\dynarray.obj
copy ..\common\$D\dynlib.obj
copy ..\common\$D\docview.obj
copy ..\common\$D\dynarray.obj
copy ..\common\$D\dynlib.obj
+ copy ..\common\$D\effects.obj
copy ..\common\$D\encconv.obj
copy ..\common\$D\event.obj
copy ..\common\$D\extended.obj
copy ..\common\$D\encconv.obj
copy ..\common\$D\event.obj
copy ..\common\$D\extended.obj
@@
-648,6
+666,7
@@
$(COMLIBOBJS1):
copy ..\common\$D\file.obj
copy ..\common\$D\fileconf.obj
copy ..\common\$D\filefn.obj
copy ..\common\$D\file.obj
copy ..\common\$D\fileconf.obj
copy ..\common\$D\filefn.obj
+ copy ..\common\$D\filename.obj
copy ..\common\$D\filesys.obj
copy ..\common\$D\fontcmn.obj
copy ..\common\$D\fontmap.obj
copy ..\common\$D\filesys.obj
copy ..\common\$D\fontcmn.obj
copy ..\common\$D\fontmap.obj
@@
-662,11
+681,11
@@
$(COMLIBOBJS1):
copy ..\common\$D\hash.obj
copy ..\common\$D\helpbase.obj
copy ..\common\$D\http.obj
copy ..\common\$D\hash.obj
copy ..\common\$D\helpbase.obj
copy ..\common\$D\http.obj
+
+$(COMLIBOBJS2):
copy ..\common\$D\imagall.obj
copy ..\common\$D\imagbmp.obj
copy ..\common\$D\image.obj
copy ..\common\$D\imagall.obj
copy ..\common\$D\imagbmp.obj
copy ..\common\$D\image.obj
-
-$(COMLIBOBJS2):
copy ..\common\$D\imaggif.obj
copy ..\common\$D\imagjpeg.obj
copy ..\common\$D\imagpcx.obj
copy ..\common\$D\imaggif.obj
copy ..\common\$D\imagjpeg.obj
copy ..\common\$D\imagpcx.obj
@@
-693,6
+712,7
@@
$(COMLIBOBJS2):
copy ..\common\$D\prntbase.obj
copy ..\common\$D\process.obj
copy ..\common\$D\protocol.obj
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
copy ..\common\$D\resource.obj
copy ..\common\$D\sckaddr.obj
copy ..\common\$D\sckfile.obj
@@
-705,12
+725,13
@@
$(COMLIBOBJS2):
copy ..\common\$D\stream.obj
copy ..\common\$D\string.obj
copy ..\common\$D\tbarbase.obj
copy ..\common\$D\stream.obj
copy ..\common\$D\string.obj
copy ..\common\$D\tbarbase.obj
+
+$(COMLIBOBJS3):
copy ..\common\$D\textcmn.obj
copy ..\common\$D\textfile.obj
copy ..\common\$D\timercmn.obj
copy ..\common\$D\tokenzr.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\treebase.obj
copy ..\common\$D\txtstrm.obj
copy ..\common\$D\unzip.obj
copy ..\common\$D\url.obj
copy ..\common\$D\txtstrm.obj
copy ..\common\$D\unzip.obj
copy ..\common\$D\url.obj
@@
-735,6
+756,7
@@
$(GENLIBOBJS):
copy ..\generic\$D\colrdlgg.obj
copy ..\generic\$D\dragimgg.obj
copy ..\generic\$D\dcpsg.obj
copy ..\generic\$D\colrdlgg.obj
copy ..\generic\$D\dragimgg.obj
copy ..\generic\$D\dcpsg.obj
+ copy ..\generic\$D\dirctrlg.obj
copy ..\generic\$D\fontdlgg.obj
copy ..\generic\$D\grid.obj
copy ..\generic\$D\gridsel.obj
copy ..\generic\$D\fontdlgg.obj
copy ..\generic\$D\grid.obj
copy ..\generic\$D\gridsel.obj
@@
-748,7
+770,6
@@
$(GENLIBOBJS):
copy ..\generic\$D\logg.obj
copy ..\generic\$D\numdlgg.obj
copy ..\generic\$D\panelg.obj
copy ..\generic\$D\logg.obj
copy ..\generic\$D\numdlgg.obj
copy ..\generic\$D\panelg.obj
- copy ..\generic\$D\plot.obj
copy ..\generic\$D\printps.obj
copy ..\generic\$D\prntdlgg.obj
copy ..\generic\$D\progdlgg.obj
copy ..\generic\$D\printps.obj
copy ..\generic\$D\prntdlgg.obj
copy ..\generic\$D\progdlgg.obj
@@
-763,7
+784,8
@@
$(GENLIBOBJS):
copy ..\generic\$D\tbarsmpl.obj
copy ..\generic\$D\textdlgg.obj
copy ..\generic\$D\tipdlg.obj
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
copy ..\generic\$D\treelay.obj
copy ..\generic\$D\wizard.obj
@@
-812,6
+834,7
@@
$(OS2LIBOBJS1):
copy ..\os2\$D\dcprint.obj
copy ..\os2\$D\dcscreen.obj
copy ..\os2\$D\dialog.obj
copy ..\os2\$D\dcprint.obj
copy ..\os2\$D\dcscreen.obj
copy ..\os2\$D\dialog.obj
+ copy ..\os2\$D\dir.obj
copy ..\os2\$D\dirdlg.obj
copy ..\os2\$D\dnd.obj
copy ..\os2\$D\filedlg.obj
copy ..\os2\$D\dirdlg.obj
copy ..\os2\$D\dnd.obj
copy ..\os2\$D\filedlg.obj
@@
-834,9
+857,9
@@
$(OS2LIBOBJS1):
copy ..\os2\$D\menu.obj
copy ..\os2\$D\menuitem.obj
copy ..\os2\$D\metafile.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\minifram.obj
copy ..\os2\$D\msgdlg.obj
copy ..\os2\$D\nativdlg.obj
copy ..\os2\$D\minifram.obj
copy ..\os2\$D\msgdlg.obj
copy ..\os2\$D\nativdlg.obj
@@
-869,6
+892,7
@@
$(OS2LIBOBJS2):
copy ..\os2\$D\utilsexc.obj
copy ..\os2\$D\wave.obj
copy ..\os2\$D\window.obj
copy ..\os2\$D\utilsexc.obj
copy ..\os2\$D\wave.obj
copy ..\os2\$D\window.obj
+ copy ..\os2\$D\xpmhand.obj
# wxWindows library as DLL
dll:
# wxWindows library as DLL
dll:
@@
-960,7
+984,7
@@
$(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
ilib $(LIBFLAGS) $@ @<<
$**;
<<
ilib $(LIBFLAGS) $@ @<<
$**;
<<
-
#
del *.obj
+ del *.obj
$(WXDIR)\lib\wx.lib: \
$D\dummy.obj \
$(WXDIR)\lib\wx.lib: \
$D\dummy.obj \
@@
-978,31
+1002,27
@@
$(WXDIR)\lib\wx.lib: \
ilib $(LIBFLAGS) $@ @<<
$**;
<<
ilib $(LIBFLAGS) $@ @<<
$**;
<<
-
#
del $(COMTEMPTGT1)
-
#
del $(COMTEMPTGT2)
-
#
del $(COMTEMPTGT3)
-
#
del $(GENTEMPTGT)
-
#
del $(HTMLTEMPTGT)
-
#
del $(NONESTEMPTGT)
-
#
del $(OS2TEMPTGT1)
-
#
del $(OS2TEMPTGT2)
+ del $(COMTEMPTGT1)
+ del $(COMTEMPTGT2)
+ del $(COMTEMPTGT3)
+ del $(GENTEMPTGT)
+ del $(HTMLTEMPTGT)
+ del $(NONESTEMPTGT)
+ del $(OS2TEMPTGT1)
+ del $(OS2TEMPTGT2)
!else
!else
-# Update the import library
-$(WXDIR)\lib\wx214.lib: $(OBJECTS)
- implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
-
# Update the dynamic link library
# Update the dynamic link library
-$(WXDIR)\lib\wx2
14
.dll: $(OBJECTS)
+$(WXDIR)\lib\wx2
3
.dll: $(OBJECTS)
icc @<<
/B" $(LINKFLAGS)" /Fe$@
$(LIBS)
$(DUMMYOBJ)
$(OBJECTS)
icc @<<
/B" $(LINKFLAGS)" /Fe$@
$(LIBS)
$(DUMMYOBJ)
$(OBJECTS)
- $(WXDIR)\
lib\wx214
.def
+ $(WXDIR)\
src\os2\wx23
.def
<<
<<
- implib $(WXDIR)\lib\wx2
14.lib $(WXDIR)\lib\wx214
.def
+ implib $(WXDIR)\lib\wx2
3.lib $(WXDIR)\src\os2\wx23
.def
!endif
!endif
@@
-1098,7
+1118,7
@@
clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
rd ..\os2\$D
del $(LIBTARGET)
!if "$(WXMAKINGDLL)" == "1"
rd ..\os2\$D
del $(LIBTARGET)
!if "$(WXMAKINGDLL)" == "1"
- erase /N ..\..\lib\wx2
14
.lib
+ erase /N ..\..\lib\wx2
3
.lib
!endif
cleanall: clean
!endif
cleanall: clean