[BACK]Return to patch-build_server_mk CVS log [TXT][DIR] Up to [local] / ports / games / ufoai / base / patches

Diff for /ports/games/ufoai/base/patches/Attic/patch-build_server_mk between version 1.1 and 1.2

version 1.1, 2011/04/18 09:30:57 version 1.2, 2011/04/19 03:49:24
Line 1 
Line 1 
 $OpenBSD$  $OpenBSD$
 --- build/server.mk.orig        Sun Jun 13 11:47:44 2010  --- build/server.mk.orig        Mon Nov 29 19:46:35 2010
 +++ build/server.mk     Fri Sep  3 00:21:24 2010  +++ build/server.mk     Mon Apr 18 16:05:08 2011
 @@ -49,7 +49,7 @@ ifeq ($(HARD_LINKED_GAME),1)  @@ -49,7 +49,7 @@ ifeq ($(HARD_LINKED_GAME),1)
         DEDICATED_CFLAGS+=$(GAME_CFLAGS)          DEDICATED_CFLAGS+=$(GAME_CFLAGS)
  endif   endif
Line 10 
Line 10 
         SERVER_SRCS += \          SERVER_SRCS += \
                 ports/linux/linux_main.c \                  ports/linux/linux_main.c \
                 ports/unix/unix_console.c \                  ports/unix/unix_console.c \
 @@ -100,7 +100,7 @@ $(SERVER_TARGET): $(SERVER_OBJS)  @@ -94,13 +94,11 @@ endif
   
    # Say how to link the exe
    $(SERVER_TARGET): $(SERVER_OBJS)
   -       @echo " * [DED] ... linking $(LNKFLAGS) ($(SERVER_LIBS))"; \
   -               $(CC) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS) $(SDL_LIBS)
   +       $(CC) $(LDFLAGS) -o $@ $(SERVER_OBJS) $(SERVER_LIBS) $(SDL_LIBS)
   
  # Say how to build .o files from .c files for this module   # Say how to build .o files from .c files for this module
  $(BUILDDIR)/server/%.o: $(SRCDIR)/%.c   $(BUILDDIR)/server/%.o: $(SRCDIR)/%.c
         @echo " * [DED] $<"; \  -       @echo " * [DED] $<"; \
 -               $(CC) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)  -               $(CC) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)
 +               $(CC) $(CPPFLAGS) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)  +       $(CC) $(CPPFLAGS) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)
   
  ifeq ($(TARGET_OS),mingw32)   ifeq ($(TARGET_OS),mingw32)
  # Say how to build .o files from .rc files for this module   # Say how to build .o files from .rc files for this module
 @@ -112,4 +112,4 @@ endif  @@ -111,5 +109,4 @@ endif
   
  # Say how to build .o files from .m files for this module   # Say how to build .o files from .m files for this module
  $(BUILDDIR)/server/%.o: $(SRCDIR)/%.m   $(BUILDDIR)/server/%.o: $(SRCDIR)/%.m
         @echo " * [DED] $<"; \  -       @echo " * [DED] $<"; \
 -               $(CC) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)  -               $(CC) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)
 +               $(CC) $(CPPFLAGS) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)  +       $(CC) $(CPPFLAGS) $(CFLAGS) $(DEDICATED_CFLAGS) $(SDL_CFLAGS) -o $@ -c $< $(CFLAGS_M_OPTS)
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
CVSweb