Remove USE_GDIPLUS setting from bakefiles.

[wxWidgets.git] / utils / screenshotgen / src / screenshotgen.bkl

diff --git a/utils/screenshotgen/src/screenshotgen.bkl b/utils/screenshotgen/src/screenshotgen.bkl
index 8ef21b97fcfbe5b347d99bc8a2ac47b55f437b7f..14457665f90a17aab6b15f49b3cd588dd65b3196 100644 (file)
--- a/utils/screenshotgen/src/screenshotgen.bkl
+++ b/utils/screenshotgen/src/screenshotgen.bkl
@@ -7,16 +7,17 @@
 
     <exe id="screenshotgen" template="wx_util" template_append="wx_append">
         <if cond="FORMAT=='autoconf'">
+            <!-- we need this for correct install_name_tool operations on Mac: -->
+            <ldflags>$(HEADER_PAD_OPTION)</ldflags>
+
             <wx-mac-app-bundle/>
             <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
-            <postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
         </if>
 
         <sources>
             screenshot_app.cpp
             screenshot_main.cpp
             guiframe.cpp
-            ctrlmaskout.cpp
             customcombo.cpp
             autocapture.cpp
         </sources>
@@ -25,7 +26,6 @@
             screenshot_app.h
             screenshot_main.h
             guiframe.h
-            ctrlmaskout.h
             customcombo.h
             autocapture.h
         </headers>
@@ -42,16 +42,23 @@
         <install-to>$(BINDIR)</install-to>
     </exe>
 
-    <wx-data id="data">
+    <wx-data id="bitmaps">
+        <dstdir>$(BUILDDIR)/bitmaps</dstdir>
+        <srcdir>$(SRCDIR)/bitmaps</srcdir>
+        <files>
+            wxwin32x32.png
+            bell.png
+            sound.png
+            dropbuth.png
+            dropbutn.png
+            dropbutp.png
+            throbber.gif
+        </files>
+    </wx-data>
+
+    <wx-data id="xml">
         <files>
             richtext.xml
-            bitmaps/wxwin32x32.png
-            bitmaps/bell.png
-            bitmaps/sound.png
-            bitmaps/dropbuth.png
-            bitmaps/dropbutn.png
-            bitmaps/dropbutp.png
-            bitmaps/throbber.gif
         </files>
     </wx-data>