From 42188488905b00144259357d36eef460acfe0cb7 Mon Sep 17 00:00:00 2001 From: Harco de Hilster Date: Mon, 1 Mar 1999 01:31:51 +0000 Subject: [PATCH] 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 --- utils/ogl/samples/ogledit/Makefile | 2 +- utils/ogl/samples/ogledit/Makefile.in | 4 ++-- utils/ogl/samples/ogledit/palette.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/ogl/samples/ogledit/Makefile b/utils/ogl/samples/ogledit/Makefile index d492ad28c4..2b68dc56ed 100644 --- 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 84755f1b63..f133f3fdab 100644 --- 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 00927bb635..2e9102f7db 100644 --- a/utils/ogl/samples/ogledit/palette.h +++ b/utils/ogl/samples/ogledit/palette.h @@ -18,7 +18,7 @@ #include #include -#ifdef __WXGTK__ +#if 0 // def __WXGTK__ #include #else #include -- 2.50.0