Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
flycast
Commits
bf84eb3c
Commit
bf84eb3c
authored
Aug 17, 2015
by
Jan Holthuis
Browse files
ARM: Append CFLAGS to ASFLAGS (because gcc is used for AS)
parent
5eaafbc7
Changes
1
Hide whitespace changes
Inline
Side-by-side
shell/linux/Makefile
View file @
bf84eb3c
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment