- Silence more "has virtual functions but non-virtual destructor" warnings

- Disable outdated and unused libjpeg

svn path=/trunk/; revision=37545

diff --git a/rosapps/applications/net/netreg/netreg.rbuild b/rosapps/applications/net/netreg/netreg.rbuild
index f407ad3..db68820 100644 (file)
--- a/rosapps/applications/net/netreg/netreg.rbuild
+++ b/rosapps/applications/net/netreg/netreg.rbuild
@@ -4,7 +4,7 @@
        <library>user32</library>
        <library>ws2_32</library>
        <library>advapi32</library>
        <library>user32</library>
        <library>ws2_32</library>
        <library>advapi32</library>

-
+       <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>

        <file>netreg.cpp</file>
        <file>netreg.rc</file>
 </module>
        <file>netreg.cpp</file>
        <file>netreg.rc</file>
 </module>

diff --git a/rosapps/applications/net/roshttpd/roshttpd.rbuild b/rosapps/applications/net/roshttpd/roshttpd.rbuild
index dfb8c85..88ca4d0 100644 (file)
--- a/rosapps/applications/net/roshttpd/roshttpd.rbuild
+++ b/rosapps/applications/net/roshttpd/roshttpd.rbuild
@@ -6,6 +6,7 @@
        <library>kernel32</library>
        <library>ws2_32</library>
        <library>user32</library>
        <library>kernel32</library>
        <library>ws2_32</library>
        <library>user32</library>

+       <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag>

        <file>config.cpp</file>
        <file>error.cpp</file>
        <file>http.cpp</file>
        <file>config.cpp</file>
        <file>error.cpp</file>
        <file>http.cpp</file>

diff --git a/rosapps/lib/directory.rbuild b/rosapps/lib/directory.rbuild
index 8940072..4552842 100644 (file)
--- a/rosapps/lib/directory.rbuild
+++ b/rosapps/lib/directory.rbuild
@@ -5,11 +5,11 @@
        <directory name="dflat32">
                <xi:include href="dflat32/dflat32.rbuild" />
        </directory>
        <directory name="dflat32">
                <xi:include href="dflat32/dflat32.rbuild" />
        </directory>

-       -->
+

        <directory name="libjpeg">
                <xi:include href="libjpeg/libjpeg.rbuild" />
        </directory>
        <directory name="libjpeg">
                <xi:include href="libjpeg/libjpeg.rbuild" />
        </directory>

-
+       -->

        <directory name="libpng">
                <xi:include href="libpng/libpng.rbuild" />
        </directory>
        <directory name="libpng">
                <xi:include href="libpng/libpng.rbuild" />
        </directory>