Commit fd913f0c authored by Jan Holthuis's avatar Jan Holthuis
Browse files

Merge pull request #762 from reicast/holzhaus/makefiles

Makefile: Fix Linux_x86
parents e942feb3 bf84eb3c
......@@ -71,7 +71,7 @@ ifneq (,$(findstring x86,$(platform)))
NOT_ARM := 1
USE_X11 := 1
MFLAGS += -m32
ASFLAGS += -32
ASFLAGS += --32
LDFLAGS += -m32
CFLAGS += -m32 -D TARGET_LINUX_x86 -D TARGET_NO_AREC -fsingle-precision-constant
CXXFLAGS += -fno-exceptions
......@@ -94,7 +94,6 @@ else ifneq (,$(findstring lincpp,$(platform)))
# Raspberry Pi 2
else ifneq (,$(findstring rpi2,$(platform)))
AS=${CC_PREFIX}gcc
MFLAGS += -marm -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard -funroll-loops
ASFLAGS += -march=armv7-a -mfpu=neon -mfloat-abi=softfp
CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP -fsingle-precision-constant
......@@ -123,7 +122,6 @@ else ifneq (,$(findstring pandora,$(platform)))
# ODROIDs
else ifneq (,$(findstring odroid,$(platform)))
AS=${CC_PREFIX}gcc
MFLAGS += -marm -mfpu=neon -mfloat-abi=hard -funroll-loops
ASFLAGS += -mfpu=neon -mfloat-abi=hard
CFLAGS += -D TARGET_BEAGLE -D TARGET_LINUX_ARMELv7 -DARM_HARDFP -fsingle-precision-constant
......@@ -179,6 +177,11 @@ INCS += -I$(RZDCY_SRC_DIR) -I$(RZDCY_SRC_DIR)/deps -I$(RZDCY_SRC_DIR)/khronos
LIBS += -lm -lrt -ldl
LIBS += -lpthread
ifndef NOT_ARM
AS=${CC_PREFIX}gcc
ASFLAGS += $(CFLAGS)
endif
ifdef USE_SDL
CXXFLAGS += `sdl-config --cflags`
LIBS += `sdl-config --libs`
......@@ -259,7 +262,7 @@ obj-$(platform)/%.build_obj : $(RZDCY_SRC_DIR)/%.c
obj-$(platform)/%.build_obj : $(RZDCY_SRC_DIR)/%.S
mkdir -p $(dir $@)
$(AS) $(ASFLAGS) $(INCS) $(CFLAGS) $< -o $@
$(AS) $(ASFLAGS) $(INCS) $< -o $@
clean:
rm $(OBJECTS) $(EXECUTABLE) -f
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment