X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FMakefile;h=d611cd933bd87dac7adc11da0dead917b71baf05;hp=eb74406aa0d94f97cbf62626dfe7b8d0a5424aa9;hb=ad15815ec04f42779d0717a6d291f93b8e847d39;hpb=81d6b6bda96a976884b3945b15a8aba126e0a157 diff --git a/src/Makefile b/src/Makefile index eb74406a..d611cd93 100644 --- a/src/Makefile +++ b/src/Makefile @@ -64,6 +64,7 @@ TARGET = allegro endif ifeq ($(PLATFORM),cross-win32) +EXTRA_LDFLAGS = -lshfolder PROGNAME = ../$(PROGBASE).exe TARGET = sdl endif @@ -75,8 +76,12 @@ endif ifeq ($(TARGET),sdl) SYS_CFLAGS = -DTARGET_SDL $(shell sdl-config --cflags) +ifeq ($(PLATFORM),macosx) +SYS_LDFLAGS = -lSDL_image -lSDL_mixer -lsmpeg $(shell sdl-config --libs) +else SYS_LDFLAGS = -lSDL_image -lSDL_mixer $(shell sdl-config --libs) endif +endif ifeq ($(TARGET),allegro) SYS_CFLAGS = -DTARGET_ALLEGRO -I$(CROSS_PATH_MSDOS)/include @@ -162,6 +167,7 @@ CNFS = conf_gfx.h \ conf_cus.h \ conf_e2g.c \ conf_esg.c \ + conf_e2s.c \ conf_fnt.c CNFS_CMD = ../Scripts/create_element_defs.pl