Return to patch-build_server_mk CVS log

Up to [local] / ports / games / ufoai / base / patches

Annotation of ports/games/ufoai/base/patches/patch-build_server_mk, Revision 1.2

1.1       yason       1: $OpenBSD$
1.2     ! yason       2: --- build/server.mk.orig       Mon Nov 29 19:46:35 2010
        !             3: +++ build/server.mk    Mon Apr 18 16:05:08 2011
1.1       yason       4: @@ -49,7 +49,7 @@ ifeq ($(HARD_LINKED_GAME),1)
                      5:        DEDICATED_CFLAGS+=$(GAME_CFLAGS)
                      6:  endif
                      7:
                      8: -ifneq ($(findstring $(TARGET_OS), netbsd freebsd linux-gnu),)
                      9: +ifneq ($(findstring $(TARGET_OS), netbsd freebsd openbsd linux-gnu),)
                     10:        SERVER_SRCS += \
                     11:                ports/linux/linux_main.c \
                     12:                ports/unix/unix_console.c \
1.2     ! yason      13: @@ -94,13 +94,11 @@ endif
        !            14:
        !            15:  # Say how to link the exe
        !            16:  $(SERVER_TARGET): $(SERVER_OBJS)
        !            17: -      @echo " * [DED] ... linking $(LNKFLAGS) ($(SERVER_LIBS))"; \
        !            18: -              $(CC) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS) $(SDL_LIBS)
        !            19: +      $(CC) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS) $(SDL_LIBS)
        !            20:
1.1       yason      21:  # Say how to build .o files from .c files for this module
                     22:  $(BUILDDIR)/server/%.o: $(SRCDIR)/%.c
1.2     ! yason      23: -      @echo " * [DED] $<"; \
1.1       yason      24: -              $(CC) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)
1.2     ! yason      25: +      $(CC) $(CPPFLAGS) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)
1.1       yason      26:
                     27:  ifeq ($(TARGET_OS),mingw32)
                     28:  # Say how to build .o files from .rc files for this module
1.2     ! yason      29: @@ -111,5 +109,4 @@ endif
        !            30:
1.1       yason      31:  # Say how to build .o files from .m files for this module
                     32:  $(BUILDDIR)/server/%.o: $(SRCDIR)/%.m
1.2     ! yason      33: -      @echo " * [DED] $<"; \
1.1       yason      34: -              $(CC) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)
1.2     ! yason      35: +      $(CC) $(CPPFLAGS) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)