X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=mercenary-reloaded.git;a=blobdiff_plain;f=src%2Fmercenary%2FMakefile.am;h=5de5d7dccf1f16d0fc894aac5b44b501e1abe3c7;hp=be50a957bd477e19e4d595250c7672ebc2bc0362;hb=6324ef1bbccd1ff00111eda853f8986a9d956105;hpb=f217ecf74d1e7f9c498c8e1a3a10fdb6711ea1a1

diff --git a/src/mercenary/Makefile.am b/src/mercenary/Makefile.am
index be50a95..5de5d7d 100644
--- a/src/mercenary/Makefile.am
+++ b/src/mercenary/Makefile.am
@@ -1,7 +1,4 @@
-AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
-
-if HAVE_SDL2
-if HAVE_GLEW
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes) -I../libglew/
 
 noinst_LIBRARIES = libmain.a
 
@@ -9,7 +6,7 @@ libmain_a_SOURCES = \
 	render.c \
 	main.c
 
-bin_PROGRAMS = mercenary3 mercenary2
+bin_PROGRAMS = mercenary2 mercenary3
 
 mercenary2_SOURCES = \
 	mercenary2.c \
@@ -28,7 +25,7 @@ mercenary2_LDADD = \
 	$(top_builddir)/src/libkeyboard/libkeyboard.a \
 	$(top_builddir)/src/libsdl/libsdl.a \
 	$(SDL2_LIBS) \
-	$(GLEW_LIBS)
+	/usr/i686-w64-mingw32/lib/libopengl32.a
 
 mercenary3_SOURCES = \
 	mercenary3.c \
@@ -47,9 +44,22 @@ mercenary3_LDADD = \
 	$(top_builddir)/src/libkeyboard/libkeyboard.a \
 	$(top_builddir)/src/libsdl/libsdl.a \
 	$(SDL2_LIBS) \
-	$(GLEW_LIBS)
+	/usr/i686-w64-mingw32/lib/libopengl32.a
 
-AM_CPPFLAGS += -DHAVE_SDL2 -DHAVE_GLEW
-endif
+mercenary2_LDADD += \
+	$(top_builddir)/src/libglew/libglew.a
+mercenary3_LDADD += \
+	$(top_builddir)/src/libglew/libglew.a
+
+if WINDOWS
+mercenary2_LDADD += \
+	/usr/i686-w64-mingw32/lib/libopengl32.a
+mercenary3_LDADD += \
+	/usr/i686-w64-mingw32/lib/libopengl32.a
+else
+mercenary2_LDADD += \
+	-lGL
+mercenary3_LDADD += \
+	-lGL
 endif