Commit cf510ad7 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

build: in Makefile.m32 moved target autodetection. 

Moved target autodetection block after defining CC macro.
parent 140ca2dc

lib/Makefile.m32

+10 −10
Original line number Diff line number Diff line
@@ -54,16 +54,6 @@ ifndef LIBCARES_PATH 
LIBCARES_PATH = $(PROOT)/ares

endif



# Set environment var ARCH to your architecture to override autodetection.

ifndef ARCH

TARGET	:= $(shell $(CC) -dumpmachine)

ifeq ($(findstring x86_64,$(TARGET)),x86_64)

ARCH	= w64

else

ARCH	= w32

endif

endif



CC	= $(CROSSPREFIX)gcc

CFLAGS	= -g -O2 -Wall

CFLAGS	+= -fno-strict-aliasing
@@ -75,6 +65,16 @@ RC = $(CROSSPREFIX)windres 
RCFLAGS	= --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF

STRIP	= $(CROSSPREFIX)strip -g



# Set environment var ARCH to your architecture to override autodetection.

ifndef ARCH

TARGET	:= $(shell $(CC) -dumpmachine)

ifeq ($(findstring x86_64,$(TARGET)),x86_64)

ARCH	= w64

else

ARCH	= w32

endif

endif



ifeq ($(ARCH),w64)

CFLAGS  += -D_AMD64_

RCFLAGS += -F pe-x86-64

src/Makefile.m32

+10 −10
Original line number Diff line number Diff line
@@ -66,16 +66,6 @@ ifndef LIBCARES_PATH 
LIBCARES_PATH = $(PROOT)/ares

endif



# Set environment var ARCH to your architecture to override autodetection.

ifndef ARCH

TARGET  := $(shell $(CC) -dumpmachine)

ifeq ($(findstring x86_64,$(TARGET)),x86_64)

ARCH    = w64

else

ARCH    = w32

endif

endif



CC	= $(CROSSPREFIX)gcc

CFLAGS	= -g -O2 -Wall

CFLAGS	+= -fno-strict-aliasing
@@ -90,6 +80,16 @@ STRIP = $(CROSSPREFIX)strip -g 
# PERL = perl

# NROFF = nroff



# Set environment var ARCH to your architecture to override autodetection.

ifndef ARCH

TARGET  := $(shell $(CC) -dumpmachine)

ifeq ($(findstring x86_64,$(TARGET)),x86_64)

ARCH    = w64

else

ARCH    = w32

endif

endif



ifeq ($(ARCH),w64)

CFLAGS	+= -D_AMD64_

RCFLAGS += -F pe-x86-64