Skip to content

Commit

Permalink
Modifying Makefile to work on Mac OS X 10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrés Mejía committed Sep 15, 2011
1 parent 587f3bf commit e951620
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Makefile
Expand Up @@ -368,6 +368,7 @@ else # ifeq Linux
ifeq ($(PLATFORM),darwin)
HAVE_VM_COMPILED=true
LIBS = -framework Cocoa
TOOLS_LIBS=
CLIENT_LIBS=
OPTIMIZEVM=

Expand Down Expand Up @@ -1100,13 +1101,14 @@ TOOLS_CFLAGS += $(TOOLS_OPTIMIZE) \
TOOLS_LIBS =
TOOLS_LDFLAGS =


ifeq ($(GENERATE_DEPENDENCIES),1)
TOOLS_CFLAGS += -MMD
endif

define DO_TOOLS_CC
$(echo_cmd) "TOOLS_CC $<"
$(Q)$(CC) $(TOOLS_CFLAGS) -o $@ -c $<
$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(TOOLS_CFLAGS) -o $@ -c $<
endef

define DO_TOOLS_CC_DAGCHECK
Expand Down Expand Up @@ -1205,7 +1207,9 @@ $(B)/tools/etc/%.o: $(Q3LCCETCDIR)/%.c

$(Q3LCC): $(Q3LCCOBJ) $(Q3RCC) $(Q3CPP)
$(echo_cmd) "LD $@"
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS)
# Andy Print linker flags
$(echo_cmd) "$(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3LCCOBJ) $(LIBS) $(TOOLS_LIBS)"
$(Q)$(CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3LCCOBJ) $(LIBS) $(TOOLS_LIBS)

define DO_Q3LCC
$(echo_cmd) "Q3LCC $<"
Expand Down Expand Up @@ -1635,6 +1639,8 @@ endif

$(B)/tremded$(FULLBINEXT): $(Q3DOBJ)
$(echo_cmd) "LD $@"
## Andy: print linker flags
$(echo_cmd) "$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)"
$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)


Expand Down
1 change: 1 addition & 0 deletions README.md
@@ -0,0 +1 @@
CC=gcc-4.0 CFLAGS='-isysroot /Developer/SDKs/MacOSX10.6.sdk' TOOLS_CFLAGS='-isysroot /Developer/SDKs/MacOSX10.6.sdk' make

0 comments on commit e951620

Please sign in to comment.