Attachment 278541 Details for Bug 412421 – Remove TARGET_CPU stuff from Makefile...

[patch] Remove TARGET_CPU stuff from Makefile...

liquidwar-5.6.3-buggy_target_cpu.patch (text/plain), 1.74 KB, created by Oliver Falk on 2007-12-05 17:02:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oliver Falk

Created: 2007-12-05 17:02:44 UTC

Size: 1.74 KB

patch

obsolete

>diff -up liquidwar-5.6.3/src/Makefile.in.buggy_target_cpu liquidwar-5.6.3/src/Makefile.in
>--- liquidwar-5.6.3/src/Makefile.in.buggy_target_cpu	2007-12-05 17:28:33.000000000 +0100
>+++ liquidwar-5.6.3/src/Makefile.in	2007-12-05 17:29:17.000000000 +0100
>@@ -6,7 +6,6 @@ datadir =         @datadir@
> DATADIR =         $(datadir)/games/liquidwar
> GAMEDIR =         $(exec_prefix)/games
> 
>-TARGET_OPT =      @TARGET_OPT@
> STATIC =          @STATIC@
> SNPRINTF =        @SNPRINTF@
> ALCFLAGS =        @ALCFLAGS@
>@@ -16,22 +15,6 @@ DEBUG =           @DEBUG@
> EFENCE =          @EFENCE@
> PTHREAD =         @PTHREAD@
> 
>-ifeq ($(TARGET_OPT),yes)
>-	TARGET =          @target@
>-	TARGET_CPU =      @target_cpu@
>-	TARGET_CPU_CC =   "-mcpu=@target_cpu@"
>-else
>-	TARGET =          default
>-	TARGET_CPU =      default
>-	TARGET_CPU_CC =
>-endif
>-
>-# -mcpu=x86_64 doesn't work, here's a workarround
>-ifeq ("@target_cpu@","x86_64")
>-	TARGET_CPU_CC =   "-m64"
>-endif
>-
>-
> ifeq ($(DEBUG),yes)
> 	DEBUG_FLAGS =   -g3
> 	DEBUG_OPTIONS = -DDEBUG
>@@ -235,7 +218,7 @@ CONFIG_OPTIONS = \
> 	-DCONFIG_UNIX_SRV=\"$(GAMEDIR)/liquidwar-server\" \
> 	-DCONFIG_UNIX_GEN=\"$(GAMEDIR)/liquidwar-mapgen\"
> 
>-CMD_CC = $(CC) $(CFLAGS) $(ALCFLAGS) -c $(DEBUG_FLAGS) -Wall -W $(TARGET_CPU_CC) $(CONFIG_OPTIONS) $(DEBUG_OPTIONS) $(SPRINTF_OPTIONS) $(ASM_OPTIONS) -DUNIX -D_THREAD_SAFE
>+CMD_CC = $(CC) $(CFLAGS) $(ALCFLAGS) -c $(DEBUG_FLAGS) -Wall -W $(CONFIG_OPTIONS) $(DEBUG_OPTIONS) $(SPRINTF_OPTIONS) $(ASM_OPTIONS) -DUNIX -D_THREAD_SAFE
> CMD_AS = $(AS) $(ASFLAGS) --32
> 
> all: $(EXE_FILES)
>@@ -269,7 +252,7 @@ distclean:
> 	@rm -f Makefile Makefile.dep base.h
> 
> %.o: %.c
>-	@echo "Compiling $< (cpu=$(TARGET_CPU), debug=$(DEBUG), asm=$(ASM))"
>+	@echo "Compiling $< (debug=$(DEBUG), asm=$(ASM))"
> 	@$(CMD_CC) $< -o $@
> 
> %.o: %.s

Actions: View | Diff

Attachments on bug 412421: 278541