equal
deleted
inserted
replaced
175 CC_TARGET = $(CC_UNI) |
175 CC_TARGET = $(CC_UNI) |
176 CFLAGS = $(CFLAGS_UNI) |
176 CFLAGS = $(CFLAGS_UNI) |
177 LDFLAGS = $(LDFLAGS_UNI) |
177 LDFLAGS = $(LDFLAGS_UNI) |
178 SDL-CONFIG = $(SDL-CONFIG_UNI) |
178 SDL-CONFIG = $(SDL-CONFIG_UNI) |
179 LIBPNG-CONFIG = $(LIBPNG-CONFIG_UNI) |
179 LIBPNG-CONFIG = $(LIBPNG-CONFIG_UNI) |
|
180 LIBS:= |
180 endif |
181 endif |
181 |
182 |
182 # this is used if there aren't any Makefile.config |
183 # this is used if there aren't any Makefile.config |
183 ifndef CONFIG_INCLUDED |
184 ifndef CONFIG_INCLUDED |
184 # sets network on by default if there aren't any config file |
185 # sets network on by default if there aren't any config file |
417 # tell the source that we are building a dedicated server |
418 # tell the source that we are building a dedicated server |
418 ifdef DEDICATED |
419 ifdef DEDICATED |
419 CDEFS += -DDEDICATED |
420 CDEFS += -DDEDICATED |
420 endif |
421 endif |
421 |
422 |
|
423 ifdef OSX |
|
424 ifdef STATIC |
|
425 ifdef UNIVERSAL_OTHER_HALF |
|
426 STATIC:= |
|
427 DYNAMIC_SDL_IN_STATIC:=1 |
|
428 endif |
|
429 endif |
|
430 endif |
|
431 |
422 # SDL config |
432 # SDL config |
423 ifdef WITH_SDL |
433 ifdef WITH_SDL |
424 CDEFS += -DWITH_SDL |
434 CDEFS += -DWITH_SDL |
425 CFLAGS += $(shell $(SDL-CONFIG) --cflags) |
435 CFLAGS += $(shell $(SDL-CONFIG) --cflags) |
426 ifdef STATIC |
436 ifdef STATIC |
428 else |
438 else |
429 LIBS += $(shell $(SDL-CONFIG) --libs) |
439 LIBS += $(shell $(SDL-CONFIG) --libs) |
430 endif |
440 endif |
431 endif |
441 endif |
432 |
442 |
|
443 ifdef DYNAMIC_SDL_IN_STATIC |
|
444 STATIC:=1 |
|
445 endif |
433 |
446 |
434 # zlib config |
447 # zlib config |
435 ifdef WITH_ZLIB |
448 ifdef WITH_ZLIB |
436 CDEFS += -DWITH_ZLIB |
449 CDEFS += -DWITH_ZLIB |
437 ifdef STATIC |
450 ifdef STATIC |