Minor updates

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/wxJpeg.icc b/src/wxJpeg.icc
index 496af674f082d083379431cf0225293c9bed0732..1a9c4c7bdf829bfe44302c0c372c00a3b45110de 100644 (file)
--- a/src/wxJpeg.icc
+++ b/src/wxJpeg.icc
@@ -1,11 +1,11 @@
-option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"), 
+option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"),

                         define("__WXPM__", ), define("__VISAGECPP__", ), define("OS232", ), define("JPEGLOCAL", ),
                         define("__WXPM__", ), define("__VISAGECPP__", ), define("OS232", ), define("JPEGLOCAL", ),

-                        incl(searchpath, "..\\src"), incl(searchpath, "..\\Include"), report(level, "E"), 
-                        file(genobject, "..\\src\\jpeg\\debugos2\\")
+                        incl(searchpath, "..\\src"), incl(searchpath, "..\\Include"), report(level, "E"),
+                        file(genobject, "..\\src\\jpeg\\dbgos240\\")

 {
    perform
    {
 {
    perform
    {

-       run before '-mkdir ' '..\\src\\jpeg\\debugos2'
+       run before '-mkdir ' '..\\src\\jpeg\\dbgos240'

    }
    target "..\\lib\\os2jpeg.lib"
    {
    }
    target "..\\lib\\os2jpeg.lib"
    {

diff --git a/src/wxPng.icc b/src/wxPng.icc
index 73f0b5dd63794543b4c0f06d576a82c66a6f2533..b8d7a7b4477662b03e58b60e59de7f04ec917291 100644 (file)
--- a/src/wxPng.icc
+++ b/src/wxPng.icc
@@ -1,11 +1,11 @@
-option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"), 
-                        define("__WXPM__", ), define("__VISAGECPP__", ), 
-                        incl(searchpath, "..\\src\\png"), incl(searchpath, "..\\src\\zlib"), report(level, "E"), 
-                        file(genobject, "..\\src\\png\\debugos2\\")
+option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"),
+                        define("__WXPM__", ), define("__VISAGECPP__", ),
+                        incl(searchpath, "..\\src\\png"), incl(searchpath, "..\\src\\zlib"), report(level, "E"),
+                        file(genobject, "..\\src\\png\\dbgos240\\")

 {
    perform
    {
 {
    perform
    {

-       run before '-mkdir ' '..\\src\\png\\debugos2'
+       run before '-mkdir ' '..\\src\\png\\dbgos240'

    }
    target type(lib) "..\\lib\\os2png.lib"
    {
    }
    target type(lib) "..\\lib\\os2png.lib"
    {

diff --git a/src/wxXpm.icc b/src/wxXpm.icc
index 96fc64a8f8db187f79d855fbcbba6c28e9e191c5..0aebe1c81ea092031bb5851d220735e080e2cdaa 100644 (file)
--- a/src/wxXpm.icc
+++ b/src/wxXpm.icc
@@ -1,30 +1,32 @@
-option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"), 
-                        define("__WXPM__", ), define("__VISAGECPP__", ), define("wx_pm", ), 
-                        incl(searchpath, "..\\src\\xpm"), report(level, "E"), 
-                        file(genobject, "..\\src\\xpm\\debugos2\\")
+option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"),
+                        define("__WXPM__", ), define("__VISAGECPP__", ), define("wx_pm", ),
+                        incl(searchpath, "..\\src\\xpm"), report(level, "E"),
+                        file(genobject, "..\\src\\xpm\\dbgos240\\")

 {
    perform
    {
 {
    perform
    {

-       run before '-mkdir ' '..\\src\\xpm\\debugos2'
+       run before '-mkdir ' '..\\src\\xpm\\dbgos240'

    }
    target "..\\lib\\os2xpm.lib"
    {
    }
    target "..\\lib\\os2xpm.lib"
    {

+      source type("c") "XPM\\ATTRIB.C"

       source type("c") "XPM\\CRBUFFRI.C"
       source type("c") "XPM\\CRDATFRI.C"
       source type("c") "XPM\\CRBUFFRI.C"
       source type("c") "XPM\\CRDATFRI.C"

+      source type("c") "XPM\\CREATE.C"

       source type("c") "XPM\\CRIFRBUF.C"
       source type("c") "XPM\\CRIFRDAT.C"
       source type("c") "XPM\\DATA.C"
       source type("c") "XPM\\HASHTAB.C"
       source type("c") "XPM\\CRIFRBUF.C"
       source type("c") "XPM\\CRIFRDAT.C"
       source type("c") "XPM\\DATA.C"
       source type("c") "XPM\\HASHTAB.C"

+      source type("c") "XPM\\IMAGE.C"
+      source type("c") "XPM\\INFO.C"

       source type("c") "XPM\\MISC.C"
       source type("c") "XPM\\PARSE.C"
       source type("c") "XPM\\RDFTODAT.C"
       source type("c") "XPM\\RDFTOI.C"
       source type("c") "XPM\\RGB.C"
       source type("c") "XPM\\SCAN.C"
       source type("c") "XPM\\MISC.C"
       source type("c") "XPM\\PARSE.C"
       source type("c") "XPM\\RDFTODAT.C"
       source type("c") "XPM\\RDFTOI.C"
       source type("c") "XPM\\RGB.C"
       source type("c") "XPM\\SCAN.C"

+      source type("c") "XPM\\SIMX.C"

       source type("c") "XPM\\WRFFRDAT.C"
       source type("c") "XPM\\WRFFRI.C"
       source type("c") "XPM\\WRFFRDAT.C"
       source type("c") "XPM\\WRFFRI.C"

-      source type("c") "XPM\\WRFFRP.C"
-      source type("c") "XPM\\CREATE.C"
-      source type("c") "XPM\\SIMX.C"

    }
 }
    }
 }

diff --git a/src/wxZlib.icc b/src/wxZlib.icc
index 80750ec71513372514b46dc1b150fd553a99a42d..16b26a6c6491b5cd3cd71bd075a68c2ca5fd3d6a 100644 (file)
--- a/src/wxZlib.icc
+++ b/src/wxZlib.icc
@@ -1,10 +1,10 @@
 option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"),
 option ProjectOptions = gen(arch, "pentium2"), opt(tune, "pentium2"),

-                        report(level, "E"), file(genobject, "..\\src\\zlib\\debugos2\\")
+                        report(level, "E"), file(genobject, "..\\src\\zlib\\dbgos240\\")

 {
 
    perform
    {
 {
 
    perform
    {

-       run before '-mkdir ' '..\\src\\zlib\\debugos2'
+       run before '-mkdir ' '..\\src\\zlib\\dbgos240'

    }
    target "..\\lib\\os2zlib.lib"
    {
    }
    target "..\\lib\\os2zlib.lib"
    {