Merge branch 'master' into bugfix/ipv6_network_fix

This commit is contained in:
Unknown 2018-09-11 15:07:56 +02:00
commit 233f7a9a3a

View file

@ -360,10 +360,10 @@ client:
$(MAKE) release/quake2 $(MAKE) release/quake2
ifeq ($(YQ2_OSTYPE), Darwin) ifeq ($(YQ2_OSTYPE), Darwin)
build/client/%.o : %.m build/client/%.o : %.c
@echo "===> CC $<" @echo "===> CC $<"
${Q}mkdir -p $(@D) ${Q}mkdir -p $(@D)
${Q}$(CC) $(OSX_ARCH) -x objective-c -c $< -o $@ ${Q}$(CC) $(OSX_ARCH) -x objective-c -c $(CFLAGS) $(SDLCFLAGS) $(ZIPCFLAGS) $(INCLUDE) $< -o $@
else else
build/client/%.o: %.c build/client/%.o: %.c
@echo "===> CC $<" @echo "===> CC $<"