Index: holotz-castle-1.3.14/src/Makefile =================================================================== --- holotz-castle-1.3.14/src/Makefile +++ holotz-castle-1.3.14/src/Makefile 2015-01-15 20:29:55.839764357 +0100 @@ -22,10 +22,11 @@ # comenta estas l�neas si no quieres instalar el juego (y descomenta las de arriba) ifndef I486_BUILD -HC_BASE = /usr/share/games/holotz-castle/ +DESTDIR = +HC_BASE = $(DESTDIR)/usr/share/games/holotz-castle/ HC_DATA = $(HC_BASE)game/ HCED_DATA = $(HC_BASE)editor/ -HC_BIN_DIR = /usr/local/bin/ +HC_BIN_DIR = $(DESTDIR)/usr/games/ endif DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\" @@ -42,8 +43,8 @@ # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib. # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile. -CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c -LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` +CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c $(MGA_CFLAGS) +LDFLAGS=$(MGA_LDFLAGS) -L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` -lz JLib: Index: holotz-castle-1.3.14/JLib/Makefile =================================================================== --- holotz-castle-1.3.14/JLib/Makefile +++ holotz-castle-1.3.14/JLib/Makefile 2015-01-15 20:28:54.450409443 +0100 @@ -19,7 +19,7 @@ endif # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag -CFLAGS=-I. -I/usr/local/include/SDL -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags` +CFLAGS=-I. -I/usr/local/include/SDL -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags` $(MGA_CFLAGS) # Sample LDFLAGS for applications # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` @@ -28,15 +28,15 @@ # JLib libJLib: $(JLIB_OBJS) - g++-4.1 -shared -L/usr/lib -fPIC -o $@.so $? \ + g++ -shared -fPIC -o $@.so $? \ && ar rvus $@.a $? \ $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp - g++-4.1 $(CFLAGS) -c -o $@ $< + g++ $(CFLAGS) -c -o $@ $< $(UTIL)/%.o: $(UTIL)/%.cpp - g++-4.1 $(CFLAGS) -c -o $@ $< + g++ $(CFLAGS) -c -o $@ $< $(MATH)/%.o: $(MATH)/%.cpp - g++-4.1 $(CFLAGS) -c -o $@ $< + g++ $(CFLAGS) -c -o $@ $< .PHONY: install install:
