Update Makefile

Fixed RPI1 build was broken after last commit #476
This commit is contained in:
Dimitris Panokostas 2019-05-04 23:51:42 +02:00 committed by GitHub
parent 10175b66fe
commit 928b4e2bf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -44,7 +44,7 @@ else ifeq ($(PLATFORM),rpi2)
NAME = amiberry-rpi2-sdl1
else ifeq ($(PLATFORM),rpi1)
CPPFLAGS += ${DISPMANX_FLAGS} -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DUSE_SDL1
CPPFLAGS += ${DISPMANX_FLAGS} -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DARMV6T2 -DUSE_SDL1
LDFLAGS += ${DISPMANX_LDFLAGS}
NAME = amiberry-rpi1-sdl1
@ -75,7 +75,7 @@ USE_SDL2 = 1
else ifeq ($(PLATFORM),rpi1-sdl2-dispmanx)
USE_SDL2 = 1
CPPFLAGS += -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DUSE_SDL2 ${DISPMANX_FLAGS}
CPPFLAGS += -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DARMV6T2 -DUSE_SDL2 ${DISPMANX_FLAGS}
LDFLAGS += ${DISPMANX_LDFLAGS}
NAME = amiberry-rpi1-sdl2-dispmanx
@ -96,7 +96,7 @@ USE_SDL2 = 1
else ifeq ($(PLATFORM),rpi1-sdl2)
USE_SDL2 = 1
CPPFLAGS += -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DUSE_SDL2
CPPFLAGS += -DARMV6_ASSEMBLY -D_FILE_OFFSET_BITS=64 -DARMV6T2 -DUSE_SDL2
NAME = amiberry-rpi1-sdl2
else ifeq ($(PLATFORM),orangepi-pc)
@ -215,7 +215,7 @@ XML_CFLAGS := $(shell xml2-config --cflags )
LDFLAGS += -flto -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed
ifndef DEBUG
CFLAGS += -Ofast -frename-registers -falign-functions=16 -fpermissive
CFLAGS += -Ofast -frename-registers -falign-functions=16
else
CFLAGS += -g -rdynamic -funwind-tables -mapcs-frame -DDEBUG -Wl,--export-dynamic
endif
@ -245,7 +245,7 @@ LDFLAGS += -lpthread -lz -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl -lmpeg2convert -
ASFLAGS += $(CFLAGS) -falign-functions=16
export CFLAGS += -pipe -Wno-shift-overflow -Wno-narrowing $(EXTRA_CFLAGS)
export CXXFLAGS += $(CFLAGS) -std=gnu++14
export CXXFLAGS += $(CFLAGS) -std=gnu++14 -fpermissive
C_OBJS= \
src/archivers/7z/BraIA64.o \