X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2FMakefile;h=86fcd3b050f66870f9c6e2c753b2bfcad6fe41dc;hb=9cb181e05e485435ef48586dd4f2811ba1e672b3;hp=286a5c9a0676af2a26e8cb13d1fd2dcda954741b;hpb=6413b637e99f65b72fa0bbb007e6dc4dd03196d1;p=rocksndiamonds.git diff --git a/src/Makefile b/src/Makefile index 286a5c9a..86fcd3b0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,7 @@ # ============================================================================= # Rocks'n'Diamonds Makefile (src) # ----------------------------------------------------------------------------- -# (c) 1995-2005 Holger Schemel +# (c) 1995-2006 Holger Schemel # ============================================================================= # ----------------------------------------------------------------------------- @@ -55,6 +55,7 @@ PLATFORM = unix endif ifeq ($(PLATFORM),macosx) +EXTRA_LDFLAGS = -lstdc++ PLATFORM = unix TARGET = sdl endif @@ -95,6 +96,12 @@ SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --libs) endif +ifeq ($(TARGET),sdl-static) +SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags) +SDL_LIBS = -lSDL_image -lSDL_mixer -lSDL_net -lsmpeg +SYS_LDFLAGS = $(SDL_LIBS) $(shell sdl-config --static-libs) +endif + ifeq ($(TARGET),allegro) SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include SYS_LDFLAGS = -lalleg @@ -245,7 +252,7 @@ conf_mus.h: conf_mus.c @$(MAKE) auto-conf $(TIMESTAMP_FILE): $(SRCS) $(LIBGAME) $(GAME_EM) - @date '+"[%Y-%m-%d %H:%M]"' \ + @date '+"%Y-%m-%d %H:%M"' \ | sed -e 's/^/#define COMPILE_DATE_STRING /' \ > $(TIMESTAMP_FILE)