cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates for build dll

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster 2000-03-09 21:07:55 +00:00
parent 9add53a470
commit 60b8078990
3 changed files with 99 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Wxwindll.icc
View File

@ -1,13 +1,28 @@
option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
link(linkwithsharedlib, "yes"), link(defaultlibsname, "..\\lib\\png.lib"),
link(defaultlibsname, "..\\lib\\xpm.lib"),
link(defaultlibsname, "..\\lib\\jpeg.lib"),
link(defaultlibsname, "..\\lib\\zlib.lib"),
link(defaultlibsname, "..\\lib\\tiff.lib"), link(extdictionary, "no"),
link(pmtype, "pm"), define("__VISAGECPP__", ), define("__WXPM__", ),
incl(searchpath, "..\\Include"), incl(searchpath, "..\\src\\jpeg"),
incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\src\\tiff"),
incl(searchpath, "..\\src\\xpm"), incl(searchpath, "..\\src\\png")
option ProjectOptions = lang(longlong, "yes"), gen(manglelinkagekeywordonlyfuncs, "no"), lang(allowtypedefasclassname, "yes"),
lang(templatedefimpls, "dontparse"), lang(compatmath, "yes"),
lang(nokeyword, "const_cast"), lang(nokeyword, "explicit"), lang(nokeyword, "false"),
lang(nokeyword, "mutable"), lang(nokeyword, "true"), lang(nokeyword, "typename"),
lang(trailingenumcommas, "no"), lang(universalcharacternames, "no"),
link(debug, "yes"), link(linkwithmultithreadlib, "yes"), link(exportAll, "yes"),
link(linkwithsharedlib, "yes"), link(defaultlibs, "yes"), link(extdictionary, "no"),
link(defaultlibsname, "..\\lib\\png.lib"),
link(defaultlibsname, "..\\lib\\xpm.lib"),
link(defaultlibsname, "..\\lib\\jpeg.lib"),
link(defaultlibsname, "..\\lib\\zlib.lib"),
link(defaultlibsname, "..\\lib\\tiff.lib"),
link(defaultlibsname, "NETAPI32.LIB"),
link(defaultlibsname, "UPM32.LIB"),
link(defaultlibsname, "..\\..\\LIB\\dummy.obj"),
link(extdictionary, "no"),link(pmtype, "pm"),
define("__VISAGECPP__", ), define("__WXPM__", ),
incl(searchpath, "..\\Include"), incl(searchpath, "..\\src\\jpeg"),
incl(searchpath, "..\\src\\zlib"), incl(searchpath, "..\\src\\tiff"),
incl(searchpath, "..\\src\\xpm"), incl(searchpath, "..\\src\\png"),
macros(redefine, "yes"),
file(usepch, "No"), debug(maxerrors, 100), info(cmp, "yes"), info(cnd, "yes"), info(cns, "yes"), info(cnv, "yes"),
info(cpy, "yes"), info(dcl, "yes"), info(eff, "yes"), info(enu, "yes"), info(ext, "yes"), info(ini, "yes"),
info(ord, "yes"), info(par, "yes"), info(rea, "yes"), info(trd, "yes"), info(tru, "yes"), info(uni, "yes"),
info(use, "yes")
{
target type("dll") "..\\lib\\Wxwindll.dll"
{
@ -21,8 +36,6 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
source type(cpp) "COMMON\\CTRLSUB.CPP"
source type(cpp) "COMMON\\DATETIME.CPP"
source type(cpp) "COMMON\\DATSTRM.CPP"
source type(cpp) "COMMON\\DB.CPP"
source type(cpp) "COMMON\\DBTABLE.CPP"
source type(cpp) "COMMON\\DCBASE.CPP"
source type(cpp) "COMMON\\DLGCMN.CPP"
source type(cpp) "COMMON\\DNDCMN.CPP"
@ -78,7 +91,6 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
source type(cpp) "COMMON\\MSTREAM.CPP"
source type(cpp) "COMMON\\OBJECT.CPP"
source type(cpp) "COMMON\\OBJSTRM.CPP"
source type(cpp) "COMMON\\ODBC.CPP"
source type(cpp) "COMMON\\PAPER.CPP"
source type(cpp) "COMMON\\PRNTBASE.CPP"
source type(cpp) "COMMON\\PROCESS.CPP"
@ -126,10 +138,9 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
source type(cpp) "GENERIC\\CHOICDGG.CPP"
source type(cpp) "GENERIC\\COLRDLGG.CPP"
source type(cpp) "GENERIC\\DCPSG.CPP"
source type(cpp) "GENERIC\\DIRDLGG.CPP"
source type(cpp) "GENERIC\\FILEDLGG.CPP"
source type(cpp) "GENERIC\\DRAGIMGG.CPP"
source type(cpp) "GENERIC\\FONTDLGG.CPP"
source type(cpp) "GENERIC\\GRID.CPP"
source type(cpp) "GENERIC\\GRIDG.CPP"
source type(cpp) "GENERIC\\GRIDSEL.CPP"
source type(cpp) "GENERIC\\HELPEXT.CPP"
source type(cpp) "GENERIC\\HELPHTML.CPP"
@ -139,8 +150,6 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
source type(cpp) "GENERIC\\LAYWIN.CPP"
source type(cpp) "GENERIC\\LISTCTRL.CPP"
source type(cpp) "GENERIC\\LOGG.CPP"
source type(cpp) "GENERIC\\MSGDLGG.CPP"
source type(cpp) "GENERIC\\NOTEBOOK.CPP"
source type(cpp) "GENERIC\\NUMDLGG.CPP"
source type(cpp) "GENERIC\\PANELG.CPP"
source type(cpp) "GENERIC\\PLOT.CPP"
@ -155,6 +164,7 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
source type(cpp) "GENERIC\\SPLITTER.CPP"
source type(cpp) "GENERIC\\STATUSBR.CPP"
source type(cpp) "GENERIC\\TABG.CPP"
source type(cpp) "GENERIC\\TBARSMPL.CPP"
source type(cpp) "GENERIC\\TEXTDLGG.CPP"
source type(cpp) "GENERIC\\TIPDLG.CPP"
source type(cpp) "GENERIC\\TREECTRL.CPP"
@ -202,10 +212,8 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
source type(cpp) "OS2\\DCPRINT.CPP"
source type(cpp) "OS2\\DCSCREEN.CPP"
source type(cpp) "OS2\\DIALOG.CPP"
source type(cpp) "OS2\\DIR.CPP"
source type(cpp) "OS2\\DIRDLG.CPP"
source type(cpp) "OS2\\DND.CPP"
source type(cpp) "OS2\\DUMMY.CPP"
source type(cpp) "OS2\\DUMMYDLL.CPP"
source type(cpp) "OS2\\FILEDLG.CPP"
source type(cpp) "OS2\\FONT.CPP"

33
src/makeva.env
View File

@ -21,6 +21,7 @@ WXDIR=$(WXWIN)
# Set to where your UPM and LAN libs are
UPMLIB=D:\MUGLIB
NETLIB=D:\IBMLAN\NETSRC\LIB
TCPIP=D:\TCPIP\LIB
WXSRC=$(WXDIR)\src\os2
WXINC=$(WXDIR)\include
@ -100,22 +101,31 @@ WXLIBNAME=$(NEW_WXLIBNAME)
!endif
!if "$(FINAL)" == "1"
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
D=RelseOS2DLL
!else
D=RelseOS2
!endif
!else
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
D=DebugOS2DLL
!else
D=DebugOS2
!endif
!endif
WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
D=$(D)DLL
!endif
INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC)
LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB
EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib
LIBS=$(WXLIB) $(EXTRALIBS)
!if "$(WXMAKINGDLL)" == "1"
LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB
EXTRALIBS=$(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\lib\os2tiffd.lib
LIBS=$(LINKLIBS) $(EXTRALIBS)
!else
LINKLIBS=CPPOM30.LIB CPPOOC3.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB
EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib $(WXDIR)\lib\os2tiff.lib
LIBS=$(WXLIB) $(LINKLIBS) $(EXTRALIBS)
!endif
MAKEPRECOMP=/FiWX/WXPREC.H
OPTIONS=
@ -150,11 +160,16 @@ CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $
# If you don't include wxprec.h, use CPPFLAGS2
CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)
LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS)
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
DUMMY=dummydll
!else
DUMMY=dummy
!endif
!else
!if "$(WXMAKINGDLL)" == "1"
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
PCH=$(WXLIBNAME).pch
DUMMY=dummydll
!else

82
src/wxWin.icc
View File

@ -22,6 +22,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "COMMON\\appcmn.cpp"
source "COMMON\\choiccmn.cpp"
source "COMMON\\clipcmn.cpp"
source "COMMON\\cmdline.cpp"
source "COMMON\\cmndata.cpp"
source "COMMON\\config.cpp"
source "COMMON\\ctrlcmn.cpp"
@ -32,6 +33,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "COMMON\\dbtable.cpp"
source "COMMON\\dcbase.cpp"
source "COMMON\\dlgcmn.cpp"
source "COMMON\\dndcmn.cpp"
source "COMMON\\dobjcmn.cpp"
source "COMMON\\docmdi.cpp"
source "COMMON\\docview.cpp"
@ -52,9 +54,11 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "COMMON\\fontmap.cpp"
source "COMMON\\framecmn.cpp"
source "COMMON\\fs_inet.cpp"
source "COMMON\\fs_mem.cpp"
source "COMMON\\fs_zip.cpp"
source "COMMON\\ftp.cpp"
source "COMMON\\gdicmn.cpp"
source "COMMON\\geometry.cpp"
source "COMMON\\gifdecod.cpp"
source "COMMON\\hash.cpp"
source "COMMON\\helpbase.cpp"
@ -67,6 +71,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "COMMON\\imagpcx.cpp"
source "COMMON\\imagpng.cpp"
source "COMMON\\imagpnm.cpp"
source "COMMON\\imagtiff.cpp"
source "COMMON\\intl.cpp"
source "COMMON\\ipcbase.cpp"
source "COMMON\\layout.cpp"
@ -81,6 +86,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "COMMON\\mstream.cpp"
source "COMMON\\object.cpp"
source "COMMON\\objstrm.cpp"
source "COMMON\\odbc.cpp"
source "COMMON\\paper.cpp"
source "COMMON\\prntbase.cpp"
source "COMMON\\process.cpp"
@ -122,40 +128,44 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
}
source "COMMON\\zipstrm.cpp"
source "COMMON\\zstream.cpp"
source "GENERIC\\busyinfo.cpp"
source "GENERIC\\calctrl.cpp"
source "GENERIC\\caret.cpp"
source "GENERIC\\choicdgg.cpp"
source "GENERIC\\colrdlgg.cpp"
source "GENERIC\\dcpsg.cpp"
source "GENERIC\\fontdlgg.cpp"
source "GENERIC\\grid.cpp"
source "GENERIC\\helpext.cpp"
source "GENERIC\\helphtml.cpp"
source "GENERIC\\helpwxht.cpp"
source "GENERIC\\helpxlp.cpp"
source "GENERIC\\imaglist.cpp"
source "GENERIC\\laywin.cpp"
source "GENERIC\\listctrl.cpp"
source "GENERIC\\logg.cpp"
source "GENERIC\\msgdlgg.cpp"
source "GENERIC\\numdlgg.cpp"
source "GENERIC\\panelg.cpp"
source "GENERIC\\plot.cpp"
source "GENERIC\\printps.cpp"
source "GENERIC\\prntdlgg.cpp"
source "GENERIC\\progdlgg.cpp"
source "GENERIC\\prop.cpp"
source "GENERIC\\propform.cpp"
source "GENERIC\\proplist.cpp"
source "GENERIC\\sashwin.cpp"
source "GENERIC\\scrolwin.cpp"
source "GENERIC\\splitter.cpp"
source "GENERIC\\statusbr.cpp"
source "GENERIC\\tabg.cpp"
source "GENERIC\\textdlgg.cpp"
source "GENERIC\\tipdlg.cpp"
source "GENERIC\\treectrl.cpp"
source "GENERIC\\BUSYINFO.CPP"
source "GENERIC\\CALCTRL.CPP"
source "GENERIC\\CARET.CPP"
source "GENERIC\\CHOICDGG.CPP"
source "GENERIC\\COLRDLGG.CPP"
source "GENERIC\\DCPSG.CPP"
source "GENERIC\\DRAGIMGG.CPP"
source "GENERIC\\FONTDLGG.CPP"
source "GENERIC\\GRID.CPP"
source "GENERIC\\GRIDSEL.CPP"
source "GENERIC\\HELPEXT.CPP"
source "GENERIC\\HELPHTML.CPP"
source "GENERIC\\HELPWXHT.CPP"
source "GENERIC\\HELPXLP.CPP"
source "GENERIC\\IMAGLIST.CPP"
source "GENERIC\\LAYWIN.CPP"
source "GENERIC\\LISTCTRL.CPP"
source "GENERIC\\LOGG.CPP"
source "GENERIC\\NUMDLGG.CPP"
source "GENERIC\\PANELG.CPP"
source "GENERIC\\PLOT.CPP"
source "GENERIC\\PRINTPS.CPP"
source "GENERIC\\PRNTDLGG.CPP"
source "GENERIC\\PROGDLGG.CPP"
source "GENERIC\\PROP.CPP"
source "GENERIC\\PROPFORM.CPP"
source "GENERIC\\PROPLIST.CPP"
source "GENERIC\\SASHWIN.CPP"
source "GENERIC\\SCROLWIN.CPP"
source "GENERIC\\SPLITTER.CPP"
source "GENERIC\\STATUSBR.CPP"
source "GENERIC\\TABG.CPP"
source "GENERIC\\TBARSMPL.CPP"
source "GENERIC\\TEXTDLGG.CPP"
source "GENERIC\\TIPDLG.CPP"
source "GENERIC\\TREECTRL.CPP"
source "GENERIC\\TREELAY.CPP"
source "GENERIC\\WIZARD.CPP"
source "HTML\\helpctrl.cpp"
source "HTML\\helpdata.cpp"
source "HTML\\helpfrm.cpp"
@ -165,12 +175,14 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "HTML\\htmltag.cpp"
source "HTML\\htmlwin.cpp"
source "HTML\\htmprint.cpp"
source "HTML\\m_dflist.cpp"
source "HTML\\m_fonts.cpp"
source "HTML\\m_hline.cpp"
source "HTML\\m_image.cpp"
source "HTML\\m_layout.cpp"
source "HTML\\m_links.cpp"
source "HTML\\m_list.cpp"
source "HTML\\m_meta.cpp"
source "HTML\\m_pre.cpp"
source "HTML\\m_tables.cpp"
source "HTML\\winpars.cpp"
@ -209,7 +221,7 @@ option ProjectOptions = gen(arch, "pentium2"), lang(longlong, "yes"), gen(mangl
source "OS2\\GDIOBJ.CPP"
option report(level, "E")
{
source "OS2\\GSOCKET.C"
source type("c") "OS2\\GSOCKET.C"
}
source "OS2\\HELPWIN.CPP"
source "OS2\\ICON.CPP"