inside <wx-data> we need to use instead of /

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

diff --git a/utils/screenshotgen/src/makefile.bcc b/utils/screenshotgen/src/makefile.bcc
index b2059387d5e7f5648afccc01d2007c5b92c356cf..bc6b21811e22126725544b91d5f334c93ace14a9 100644 (file)
--- a/utils/screenshotgen/src/makefile.bcc
+++ b/utils/screenshotgen/src/makefile.bcc
@@ -260,7 +260,7 @@ $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS)  $(OBJS)\screenshotgen_scree
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %f in (richtext.xml bitmaps/wxwin32x32.png bitmaps/bell.png bitmaps/sound.png bitmaps/dropbuth.png bitmaps/dropbutn.png bitmaps/dropbutp.png bitmaps/throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

 
 $(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
        $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
 
 $(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
        $(CXX) -q -c -P -o$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp

diff --git a/utils/screenshotgen/src/makefile.gcc b/utils/screenshotgen/src/makefile.gcc
index 9f3f9d6797f46dc038dc3c999eebdff01acf4697..c1f0cd3dcdb8287afa43bf346cb19918a9446b8b 100644 (file)
--- a/utils/screenshotgen/src/makefile.gcc
+++ b/utils/screenshotgen/src/makefile.gcc
@@ -253,7 +253,7 @@ $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screen
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %%f in (richtext.xml bitmaps/wxwin32x32.png bitmaps/bell.png bitmaps/sound.png bitmaps/dropbuth.png bitmaps/dropbutn.png bitmaps/dropbutp.png bitmaps/throbber.gif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+       for %%f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)

 
 $(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp
        $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\screenshotgen_screenshot_app.o: ./screenshot_app.cpp
        $(CXX) -c -o $@ $(SCREENSHOTGEN_CXXFLAGS) $(CPPDEPS) $<

diff --git a/utils/screenshotgen/src/makefile.vc b/utils/screenshotgen/src/makefile.vc
index 436287b023d8a783f81e8f18260cd1bc06e7de12..21fba509c0548811db8ef3b67a98dee724720960 100644 (file)
--- a/utils/screenshotgen/src/makefile.vc
+++ b/utils/screenshotgen/src/makefile.vc
@@ -336,7 +336,7 @@ $(OBJS)\screenshotgen.exe: $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_screen
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %f in (richtext.xml bitmaps/wxwin32x32.png bitmaps/bell.png bitmaps/sound.png bitmaps/dropbuth.png bitmaps/dropbutn.png bitmaps/dropbutp.png bitmaps/throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

 
 $(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp
 
 $(OBJS)\screenshotgen_screenshot_app.obj: .\screenshot_app.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(SCREENSHOTGEN_CXXFLAGS) .\screenshot_app.cpp

diff --git a/utils/screenshotgen/src/makefile.wat b/utils/screenshotgen/src/makefile.wat
index a482dbad5fd12cffc1b46740b688ae10a674c5d0..d28fd01ab826ef6a55714837d783d4dfc27d5cdc 100644 (file)
--- a/utils/screenshotgen/src/makefile.wat
+++ b/utils/screenshotgen/src/makefile.wat
@@ -290,7 +290,7 @@ $(OBJS)\screenshotgen.exe :  $(SCREENSHOTGEN_OBJECTS) $(OBJS)\screenshotgen_scre
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %f in (richtext.xml bitmaps/wxwin32x32.png bitmaps/bell.png bitmaps/sound.png bitmaps/dropbuth.png bitmaps/dropbutn.png bitmaps/dropbutp.png bitmaps/throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (richtext.xml bitmaps\wxwin32x32.png bitmaps\bell.png bitmaps\sound.png bitmaps\dropbuth.png bitmaps\dropbutn.png bitmaps\dropbutp.png bitmaps\throbber.gif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

 
 $(OBJS)\screenshotgen_screenshot_app.obj :  .AUTODEPEND .\screenshot_app.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<
 
 $(OBJS)\screenshotgen_screenshot_app.obj :  .AUTODEPEND .\screenshot_app.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(SCREENSHOTGEN_CXXFLAGS) $<

diff --git a/utils/screenshotgen/src/screenshotgen.bkl b/utils/screenshotgen/src/screenshotgen.bkl
index 8ef21b97fcfbe5b347d99bc8a2ac47b55f437b7f..ba087abae257d22ce1b7a770afd58f1b7da50d6d 100644 (file)
--- a/utils/screenshotgen/src/screenshotgen.bkl
+++ b/utils/screenshotgen/src/screenshotgen.bkl
@@ -45,13 +45,13 @@
     <wx-data id="data">
         <files>
             richtext.xml
     <wx-data id="data">
         <files>
             richtext.xml

-            bitmaps/wxwin32x32.png
-            bitmaps/bell.png
-            bitmaps/sound.png
-            bitmaps/dropbuth.png
-            bitmaps/dropbutn.png
-            bitmaps/dropbutp.png
-            bitmaps/throbber.gif
+            bitmaps$(DIRSEP)wxwin32x32.png
+            bitmaps$(DIRSEP)bell.png
+            bitmaps$(DIRSEP)sound.png
+            bitmaps$(DIRSEP)dropbuth.png
+            bitmaps$(DIRSEP)dropbutn.png
+            bitmaps$(DIRSEP)dropbutp.png
+            bitmaps$(DIRSEP)throbber.gif

         </files>
     </wx-data>
 
         </files>
     </wx-data>