From d39356d524991262819a13f8cd2cf09afb7c850c Mon Sep 17 00:00:00 2001 From: Harco de Hilster Date: Sat, 28 Aug 1999 15:31:13 +0000 Subject: [PATCH] Added a hack to configure.in to enable cross compiling of glcanvas; search for GL_TOOLKIT_DIR to see what I mean. Added Makefile.in to glcanvas/win git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 11 ++++++++++- utils/glcanvas/Makefile.in | 2 +- utils/glcanvas/win/Makefile.in | 21 +++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 utils/glcanvas/win/Makefile.in diff --git a/configure.in b/configure.in index 1c6fe05030..824dbb9050 100644 --- a/configure.in +++ b/configure.in @@ -2751,6 +2751,15 @@ AC_PROG_MAKE_SET AC_CONFIG_HEADER(setup.h:setup.h.in) +dnl Duh! glcanvas/$(TOOLKIT_DIR) doesn't work for msw because some +dnl genius called it "win" +if test "${TOOLKIT_DIR}" = "msw" ; then + GL_TOOLKIT_DIR="win" +else + GL_TOOLKIT_DIR="${TOOLKIT_DIR}" +fi +dnl It's needed in glcanvas/Makefile.in so we even have to subst this hack! +AC_SUBST(GL_TOOLKIT_DIR) dnl create each of the files in the space separated list from the file.in dnl (the original file name may be overriden by appending another name after a @@ -2807,7 +2816,7 @@ AC_OUTPUT([ utils/wxMMedia2/lib/Makefile utils/wxMMedia2/sample/Makefile utils/glcanvas/Makefile - utils/glcanvas/${TOOLKIT_DIR}/Makefile + utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile ], [ chmod +x wx-config diff --git a/utils/glcanvas/Makefile.in b/utils/glcanvas/Makefile.in index 1a811e8389..ac286b6794 100644 --- a/utils/glcanvas/Makefile.in +++ b/utils/glcanvas/Makefile.in @@ -1,3 +1,3 @@ all: - cd @TOOLKIT_DIR@; make + cd @GL_TOOLKIT_DIR@; make cd samples; make diff --git a/utils/glcanvas/win/Makefile.in b/utils/glcanvas/win/Makefile.in new file mode 100644 index 0000000000..5364a0b0a6 --- /dev/null +++ b/utils/glcanvas/win/Makefile.in @@ -0,0 +1,21 @@ +# +# File: Makefile +# Author: Robert Roebling +# Created: 1999 +# Updated: +# Copyright: (c) 1998 Robert Roebling +# +# "%W% %G%" +# + +top_srcdir = @top_srcdir@ +top_builddir = ../../.. + +VPATH= $(top_srcdir)/utils/glcanvas/win + +LIBTARGET=libwxglcanvas + +OBJECTS=glcanvas.o + +include $(top_builddir)/src/makelib.env +