Use -no-undefined for win32 builds

[grits] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9cb7454686386f3370978def49aedc56b4ba2fdf..18659d3df686f0e17a3060c989e530933636dd46 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,9 @@
 SUBDIRS = data objects . plugins
 
 AM_CFLAGS   = -Wall --std=gnu99 -I$(top_srcdir)/src
-AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(SOUP_CFLAGS)
-AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(SOUP_LIBS)
-AM_LDFLAGS  = --as-needed -no-undefined
+AM_CPPFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GL_CFLAGS) $(SOUP_CFLAGS)
+AM_LDADD    = $(GLIB_LIBS) $(GTK_LIBS) $(GL_LIBS) $(SOUP_LIBS)
+AM_LDFLAGS  = -Wl,--as-needed -Wl,--no-undefined
 
 BUILT_SOURCES = grits-marshal.c grits-marshal.h
 
@@ -35,11 +35,12 @@ libgrits_la_SOURCES = grits.h \
        grits-marshal.c grits-marshal.h \
        grits-util.c    grits-util.h    \
        roam.c          roam.h          \
+       gtkgl.c         gtkgl.h         \
        gpqueue.c       gpqueue.h
 libgrits_la_CPPFLAGS = $(AM_CPPFLAGS) \
        -DPKGDATADIR="\"$(dots)$(datadir)/$(GRITS_SUBDIR)\"" \
        -DPLUGINSDIR="\"$(dots)$(libdir)/$(GRITS_SUBDIR)\""
-libgrits_la_LIBADD  = $(AM_LDADD) \
+libgrits_la_LIBADD  = $(AM_LDADD) -lm \
        objects/libgrits-objects.la \
        data/libgrits-data.la
 libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
@@ -47,28 +48,26 @@ libgrits_la_LDFLAGS = $(AM_LDFLAGS) \
 
 # Demo program
 if WIN32
-AM_LDFLAGS += -mwindows
-dots        = ..
+AM_CPPFLAGS += -DUSE_WGL
+AM_LDFLAGS  += -mwindows -no-undefined
+dots         = ..
 else
-BINLDFLAGS  = -static
+AM_CPPFLAGS += -DUSE_GLX
 endif
 
 bin_PROGRAMS = grits-demo
 
 grits_demo_SOURCES = grits-demo.c
 grits_demo_LDADD   = $(AM_LDADD) libgrits.la
-grits_demo_LDFLAGS = $(BINLDFLAGS)
 
 # Test programs
 noinst_PROGRAMS = grits-test tile-test
 
 grits_test_SOURCES = grits-test.c
 grits_test_LDADD   = $(AM_LDADD) libgrits.la
-grits_test_LDFLAGS = $(BINLDFLAGS)
 
 tile_test_SOURCES = tile-test.c
 tile_test_LDADD   = $(AM_LDADD) libgrits.la
-tile_test_LDFLAGS = $(BINLDFLAGS)
 
 
 MAINTAINERCLEANFILES = Makefile.in
@@ -99,5 +98,5 @@ memcheck: all
                 --num-callers=50               \
                 --suppressions=gtk.suppression \
                 --suppressions=/usr/lib/valgrind/default.supp \
-                ./grits-test                   \
+                .libs/grits-test               \
        2> valgrind.out