Added "set new icon" menu item to taskbar sample; updated some makefiles

[wxWidgets.git] / src / Wxwindll.icc

diff --git a/src/Wxwindll.icc b/src/Wxwindll.icc
index ff5e48ef5b1c29cc181e421d200d305d853feda2..a80f4083578f5550e684a07187e5957ffe799c90 100644 (file)
--- a/src/Wxwindll.icc
+++ b/src/Wxwindll.icc
@@ -1,18 +1,45 @@
-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\\os2png.lib"),
+                        link(defaultlibsname, "..\\lib\\os2xpm.lib"),
+                        link(defaultlibsname, "..\\lib\\os2jpeg.lib"),
+                        link(defaultlibsname, "..\\lib\\os2zlib.lib"),
+                        link(defaultlibsname, "..\\lib\\os2tiff.lib"),
+                        link(defaultlibsname, "NETAPI32.LIB"),
+                        link(defaultlibsname, "UPM32.LIB"),
+                        link(defaultlibsname, "TCP32DLL.LIB"),
+                        link(defaultlibsname, "SO32DLL.LIB"),
+                        link(defaultlibsname, "TCPIP32.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(genobject, "..\\src\\common\\dbgos240dll\\"),
+                        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")
 {
+   perform
+   {
+       run before '-mkdir ' '..\\src\\common\\dbgos240dll'
+       run before '-mkdir ' '..\\samples\\minimal\\dbgos240dll'
+       run before 'copy ' '..\\src\common\\dosyacc.c ' '..\\src\\common\\y_tab.c'
+       run before 'copy ' '..\\src\common\\doslex.c ' '..\\src\\common\\lex_yy.c'
+   }
    target type("dll") "..\\lib\\Wxwindll.dll"
    {
       source type(cpp) "COMMON\\APPCMN.CPP"
       source type(cpp) "COMMON\\CHOICCMN.CPP"
+      source type(cpp) "COMMON\\CSHELP.CPP"
       source type(cpp) "COMMON\\CLIPCMN.CPP"
       source type(cpp) "COMMON\\CMDLINE.CPP"
       source type(cpp) "COMMON\\CMNDATA.CPP"
@@ -21,8 +48,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"
@@ -31,6 +56,7 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
       source type(cpp) "COMMON\\DOCVIEW.CPP"
       source type(cpp) "COMMON\\DYNARRAY.CPP"
       source type(cpp) "COMMON\\DYNLIB.CPP"
+      source type(cpp) "COMMON\\EFFECTS.CPP"
       source type(cpp) "COMMON\\ENCCONV.CPP"
       source type(cpp) "COMMON\\EVENT.CPP"
       option report(level, "W")
@@ -41,6 +67,7 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
       source type(cpp) "COMMON\\FILE.CPP"
       source type(cpp) "COMMON\\FILECONF.CPP"
       source type(cpp) "COMMON\\FILEFN.CPP"
+      source type(cpp) "COMMON\\FILENAME.CPP"
       source type(cpp) "COMMON\\FILESYS.CPP"
       source type(cpp) "COMMON\\FONTCMN.CPP"
       source type(cpp) "COMMON\\FONTMAP.CPP"
@@ -64,6 +91,7 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
       source type(cpp) "COMMON\\IMAGPNG.CPP"
       source type(cpp) "COMMON\\IMAGPNM.CPP"
       source type(cpp) "COMMON\\IMAGTIFF.CPP"
+      source type(cpp) "COMMON\\IMAGXPM.CPP"
       source type(cpp) "COMMON\\INTL.CPP"
       source type(cpp) "COMMON\\IPCBASE.CPP"
       source type(cpp) "COMMON\\LAYOUT.CPP"
@@ -78,7 +106,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"
@@ -99,6 +126,7 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
       source type(cpp) "COMMON\\TEXTFILE.CPP"
       source type(cpp) "COMMON\\TIMERCMN.CPP"
       source type(cpp) "COMMON\\TOKENZR.CPP"
+      source type(cpp) "COMMON\\TREEBASE.CPP"
       source type(cpp) "COMMON\\TXTSTRM.CPP"
       option report(level, "E")
       {
@@ -126,10 +154,10 @@ 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\\DIRCTRLG.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,11 +167,8 @@ 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"
       source type(cpp) "GENERIC\\PRINTPS.CPP"
       source type(cpp) "GENERIC\\PRNTDLGG.CPP"
       source type(cpp) "GENERIC\\PROGDLGG.CPP"
@@ -155,9 +180,11 @@ 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"
+      source type(cpp) "GENERIC\\TIPWIN.CPP"
+      source type(cpp) "GENERIC\\TREECTLG.CPP"
       source type(cpp) "GENERIC\\TREELAY.CPP"
       source type(cpp) "GENERIC\\WIZARD.CPP"
       source type(cpp) "HTML\\HELPCTRL.CPP"
@@ -205,7 +232,6 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
       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"
@@ -263,5 +289,21 @@ option link(debug, "yes"), link(linkwithmultithreadlib, "yes"),
       source type(cpp) "OS2\\UTILSEXC.CPP"
       source type(cpp) "OS2\\WAVE.CPP"
       source type(cpp) "OS2\\WINDOW.CPP"
+      source type(cpp) "OS2\\XPMHAND.CPP"
+   }
+//   target "..\\samples\\minimal\\dbgos240dll\\Minimal.exe"
+//   {
+//      source type(cpp) "..\\SAMPLES\\MINIMAL\\MINIMAL.CPP"
+//      source type(rc) "..\\SAMPLES\\MINIMAL\\MINIMAL.RC4"
+//   }
+   target "..\\samples\\menu\\dbgos240dll\\Menu.exe"
+   {
+      source type(cpp) "..\\SAMPLES\\MENU\\MENU.CPP"
+      source type(rc) "..\\SAMPLES\\MENU\\MENU.RC4"
    }
+//   target "..\\samples\\statbar\\dbgos240dll\\Statbar.exe"
+//   {
+//      source type(cpp) "..\\SAMPLES\\STATBAR\\STATBAR.CPP"
+//      source type(rc) "..\\SAMPLES\\STATBAR\\STATBAR.RC4"
+//   }
 }