On Sun, Nov 14, 2010 at 03:28:00AM -0500, Braden McDaniel wrote:
PLATFORM_WIN32 is true for cygwin and mingw environments.
USE_WIN32 is true when building with the GTK+ Win32 backend.
So there are definitely instances where PLATFORM_WIN32 could be true
while USE_WIN32 is false (building against X11 on Windows, most likely).
Due to the Win32 API calls in that example, USE_WIN32 is what we ought
to be using there.
In fact, I think USE_WIN32 should replace all
instances of PLATFORM_WIN32 in examples/Makefile.am.
Furthermore... The only other places we're using PLATFORM_WIN32 is to
apply the libtool argument "-no-undefined" conditionally. I don't know
of a reason why we shouldn't just apply "-no-undefined" everywhere and
get rid of PLATFORM_WIN32.
So how about the following patch (instead of the one I previously posted).
Additionally, to make things consistant, I suggest that USE_WIN32 and USE_X11
are renamed to TARGET_WIN32 and TARGET_X11 respectively.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 40378fd..97c348f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -156,8 +156,7 @@ font_pangoft2_tex_CPPFLAGS = $(AM_CPPFLAGS) $(PANGOFT2_CFLAGS)
font_pangoft2_tex_LDFLAGS = $(AM_LDFLAGS) $(PANGOFT2_LIBS) $(GTKGLEXT_DEP_LIBS_WITH_PANGOFT2) $(GLU_LIBS) $(GL_LIBS)
endif
-if !PLATFORM_WIN32
-if !TARGET_QUARTZ
+if USE_X11
if GLU
noinst_PROGRAMS += simple-pbuffer-sgix
nodist_EXTRA_simple_pbuffer_sgix_SOURCES = dummy.cpp
@@ -165,16 +164,14 @@ simple_pbuffer_sgix_SOURCES = simple-pbuffer-sgix.c
simple_pbuffer_sgix_LDFLAGS = $(GLU_LIBS) $(GL_LIBS)
endif
endif
-endif
-if PLATFORM_WIN32
+if USE_WIN32
noinst_PROGRAMS += wglinfo
wglinfo_SOURCES = wglinfo.c
wglinfo_LDADD = $(GL_LIBS) $(WINDOWING_LIBS)
endif
-if !PLATFORM_WIN32
-if !TARGET_QUARTZ
+if USE_X11
if GLU
noinst_PROGRAMS += glxinfo
nodist_EXTRA_glxinfo_SOURCES = dummy.cpp
@@ -182,7 +179,6 @@ glxinfo_SOURCES = glxinfo.c
glxinfo_LDADD = $(WINDOWING_LIBS) $(GLU_LIBS) $(GL_LIBS) $(MATH_LIB)
endif
endif
-endif
EXTRA_DIST += glade/README \
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.
Attachment:
signature.asc
Description: Digital signature