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
libretro-chailove
Commits
11d54728
Commit
11d54728
authored
Oct 10, 2018
by
Libretro-Admin
Browse files
Revert "Exclude this from static linking targets"
This reverts commit
f85cef23
.
parent
f85cef23
Changes
4
Hide whitespace changes
Inline
Side-by-side
Makefile.common
View file @
11d54728
...
...
@@ -27,7 +27,6 @@ ifneq ($(STATIC_LINKING), 1)
$(CORE_DIR)
/vendor/libretro-common/audio/audio_mix.c
\
$(CORE_DIR)
/vendor/libretro-common/audio/audio_mixer.c
\
$(CORE_DIR)
/vendor/libretro-common/audio/conversion/
*
.c
\
$(CORE_DIR)
/vendor/libretro-common/utils/md5.c
\
$(CORE_DIR)
/vendor/libretro-common/audio/resampler/audio_resampler.c
\
$(CORE_DIR)
/vendor/libretro-common/audio/resampler/drivers/nearest_resampler.c
\
$(CORE_DIR)
/vendor/libretro-common/audio/resampler/drivers/null_resampler.c
\
...
...
@@ -46,12 +45,7 @@ ifneq ($(STATIC_LINKING), 1)
$(CORE_DIR)
/vendor/libretro-common/memmap/memalign.c
\
$(CORE_DIR)
/vendor/libretro-common/streams/file_stream.c
\
$(CORE_DIR)
/vendor/libretro-common/vfs/
*
.c
\
)
# MD5
FLAGS
+=
-I
$(CORE_DIR)
/vendor/libretro-common/include
# Ensure the sinc_resampler_neon is available for ARM NEON devices.
OBJECTS
+=
$(CORE_DIR)
/vendor/libretro-common/audio/resampler/drivers/sinc_resampler_neon.o
endif
...
...
@@ -179,6 +173,10 @@ FLAGS += -I$(CORE_DIR)/vendor/Snippets
# STB
FLAGS
+=
-I
$(CORE_DIR)
/vendor/stb
# MD5
FLAGS
+=
-I
$(CORE_DIR)
/vendor/libretro-common/include
SOURCES_C
+=
$(CORE_DIR)
/vendor/libretro-common/utils/md5.c
# TinySHA1
FLAGS
+=
-I
$(CORE_DIR)
/vendor/TinySHA1
...
...
chaiscript
@
ac0d7ce9
Compare
2e77b9d0
...
ac0d7ce9
Subproject commit
2e77b9d0bf0162f178e71c14ad55140325e5349c
Subproject commit
ac0d7ce94925f8eac367533b276d9d7db13a77ae
libretro-common
@
29905d94
Compare
7d3982a9
...
29905d94
Subproject commit
7d3982a9d687491a594e98c575e00778f31702af
Subproject commit
29905d94e39090dbde5f9e6d726eb2510618704a
styleguide
@
d3881b4f
Compare
1b206ee3
...
d3881b4f
Subproject commit
1b206ee36263b16ec18f7b2f86a2b770b7490844
Subproject commit
d3881b4fa910526f0e60e56d0110a9c6492949d8
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