From 5d4aa118a07c6ecbac0aa6503b33097ead0ff642 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Sat, 17 Dec 2011 20:31:51 +0000 Subject: [PATCH] [Fix] Makefiles work for real this time.. --- Bin/Makefile | 2 +- src/libUnuk/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Bin/Makefile b/Bin/Makefile index 72446c1..93d1d7c 100644 --- a/Bin/Makefile +++ b/Bin/Makefile @@ -1,6 +1,6 @@ CC = g++ CFLAGS = -ansi -Wall -g -LDADD = -lGL -lGLU -lglut -lSDL +LDADD = -lGL -lGLU -lglut -lSDL -lSDL_image -lSDL_gfx -lSDL_ttf -ltinyxml LDADDSTATIC = -Wl,-Bstatic -lSDL -lSDL_image -lopenal -lalut -L/usr/X11 -Wl,-Bdynamic -lasound -lartsc -lesd -lpulse -lpulse-simple -ldirectfb -lvga -laa -lcaca -ljpeg -ltiff - .PHONY: default static all clean diff --git a/src/libUnuk/Makefile b/src/libUnuk/Makefile index 5c6fef0..b455e5d 100644 --- a/src/libUnuk/Makefile +++ b/src/libUnuk/Makefile @@ -1,9 +1,9 @@ CC = g++ CFLAGS = -ansi -Wall -g -LDADD = -lGL -lGLU -lSDL -objects = ApplySurface.o Button.o, ButtonToggle.o Character.o Collision.o \ - Debug.o FPS.o Font.o ImageLoader.o InGameMenu.o Input.o MainMenu.o \ - Map.o MapElement.o MapEntities.o MapTile.o Menu.o NPC.o ParticleEmitter.o \ +LDADD = -lGL -lGLU -lSDL -lSDL_ttf -lSDL_gfx -lSDL_image -ltinyxml +objects = ApplySurface.o Button.o ButtonToggle.o Character.o Collision.o \ + Debug.o Font.o ImageLoader.o IngameMenu.o Input.o MainMenu.o \ + Map.o MapElement.o MapEntities.o NPC.o ParticleEmitter.o \ Rect.o Text.o Texture.o TextureManager.o Timer.o \ .PHONY: default all clean