Modified makefile.unx to include bitmaps dir. Added missing folder.xpm

to bitmaps

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

diff --git a/utils/ogl/samples/studio/bitmaps/folder.xpm b/utils/ogl/samples/studio/bitmaps/folder.xpm
new file mode 100644 (file)
index 0000000..fdabbfb
--- /dev/null
+++ b/utils/ogl/samples/studio/bitmaps/folder.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * folder_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"16 16 6 1",
+/* colors */
+"       s None  c None",
+".      c #000000",
+"+      c #c0c0c0",
+"@      c #808080",
+"#      c #ffff00",
+"$      c #ffffff",
+/* pixels */
+"                ",
+"   @@@@@        ",
+"  @#+#+#@       ",
+" @#+#+#+#@@@@@@ ",
+" @$$$$$$$$$$$$@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @$+#+#+#+#+#+@.",
+" @$#+#+#+#+#+#@.",
+" @@@@@@@@@@@@@@.",
+"  ..............",
+"                ",
+"                "};
+

diff --git a/utils/ogl/samples/studio/makefile.unx b/utils/ogl/samples/studio/makefile.unx
index d1cca943078655cce4b9c226ac6fa283e1266f24..5fca57a097e45433f4f78de287cf0938b31a8932 100644 (file)
--- a/utils/ogl/samples/studio/makefile.unx
+++ b/utils/ogl/samples/studio/makefile.unx
@@ -14,10 +14,10 @@ PROGRAM=studio
 OBJECTS=$(PROGRAM).o doc.o shapes.o symbols.o view.o cspalette.o\
   mainfrm.o project.o dialogs.o csprint.o
 
-EXTRACPPFLAGS=-I$(WXDIR)/utils/ogl/src
+EXTRACPPFLAGS=-I$(WXDIR)/utils/ogl/src -I./bitmaps
 EXTRALDLIBS=-logl$(GUISUFFIX)
 
-WXDIR=/home/jacs/wx2
+#WXDIR=/home/jacs/wx2
 
 include $(WXDIR)/src/makeprog.env