Added Makefile[.in] for wxGTK standard build. Are not yet used, because

wxGTK's createall script doesn't look in this dir...

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

diff --git a/utils/ogl/samples/ogledit/Makefile b/utils/ogl/samples/ogledit/Makefile
index d492ad28c4a49f78736ef9068e24873b613f6ca5..2b68dc56ed38ec5c94a8accb6bcf55ac72c16e61 100644 (file)
--- a/utils/ogl/samples/ogledit/Makefile
+++ b/utils/ogl/samples/ogledit/Makefile
@@ -1 +1 @@
-include ../../../../install/unix/setup/general/makedirs
+include ../../../../setup/general/makedirs

diff --git a/utils/ogl/samples/ogledit/Makefile.in b/utils/ogl/samples/ogledit/Makefile.in
index 84755f1b63e615ca4b7397faa421d03da94374c0..f133f3fdab1e73d5f756ac6a7a880992eac172b4 100644 (file)
--- a/utils/ogl/samples/ogledit/Makefile.in
+++ b/utils/ogl/samples/ogledit/Makefile.in
@@ -9,7 +9,7 @@ RULE=bin
 # define exexutable name
 BIN_TARGET=ogledit
 # define library sources
-BIN_SRC=\
+BIN_CPP_SRC=\
   ogledit.cpp\
   doc.cpp\
   view.cpp\
@@ -23,7 +23,7 @@ BIN_OBJ=\
 BIN_LINK=-lwx_ogl_gtk
 
 # additional things needed to compile
-ADD_COMPILE=-I../../src
+ADD_COMPILE=-I../../../src
 
 # include the definitions now
 include ../../../../../template.mak

diff --git a/utils/ogl/samples/ogledit/palette.h b/utils/ogl/samples/ogledit/palette.h
index 00927bb635e28286a45f79689cad4054aeb3dd26..2e9102f7db62ed768d0790a49313f6fc2eab93f4 100644 (file)
--- a/utils/ogl/samples/ogledit/palette.h
+++ b/utils/ogl/samples/ogledit/palette.h
@@ -18,7 +18,7 @@
 
 #include <wx/wx.h>
 #include <wx/string.h>
-#ifdef __WXGTK__
+#if 0 // def __WXGTK__
 #include <wx/toolbar.h>
 #else
 #include <wx/tbarsmpl.h>