diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-10-30 00:03:21 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-10-30 00:03:21 +0000 |
| commit | 2757af6c1d5fe20459b3c46c9f42a536e9118427 (patch) | |
| tree | 11034fa4d9b9d9957245ae30159e24c78bb10a18 /build/exe.mk | |
| parent | 4f4d9675dec927272e307bc2c6329f7c6bda5f30 (diff) | |
| download | flac-2757af6c1d5fe20459b3c46c9f42a536e9118427.tar.gz | |
get Makefile.lite system (with asm) working on Darwin, better handling of libogg paths and linkage
Diffstat (limited to 'build/exe.mk')
| -rw-r--r-- | build/exe.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/build/exe.mk b/build/exe.mk index abc4c8b2..beea3214 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -29,10 +29,6 @@ CC = gcc CCC = g++ endif NASM = nasm -# override to -dynamic on OSX -ifeq ($(DARWIN_BUILD),yes) -LINKAGE = -dynamic -endif LINK = $(CC) $(LINKAGE) OBJPATH = $(topdir)/obj BINPATH = $(OBJPATH)/$(BUILD)/bin @@ -58,11 +54,21 @@ debug : $(ORDINALS_H) $(DEBUG_PROGRAM) valgrind: $(ORDINALS_H) $(DEBUG_PROGRAM) release : $(ORDINALS_H) $(RELEASE_PROGRAM) +# by default on OS X we link with static libs as much as possible + $(DEBUG_PROGRAM) : $(DEBUG_OBJS) +ifeq ($(DARWIN_BUILD),yes) + $(LINK) -o $@ $(DEBUG_OBJS) $(EXPLICIT_LIBS) +else $(LINK) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS) +endif $(RELEASE_PROGRAM) : $(RELEASE_OBJS) +ifeq ($(DARWIN_BUILD),yes) + $(LINK) -o $@ $(RELEASE_OBJS) $(EXPLICIT_LIBS) +else $(LINK) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS) +endif %.debug.o %.release.o : %.c $(CC) $(CFLAGS) -c $< -o $@ |