ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #437 from bigfatbrowncat/avian-pack-new

Browse Source 
Some small tunes for avian-pack #2
This commit is contained in:
Joshua Warner 2015-06-02 21:33:52 +00:00
commit 6c07b1c8ae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makefile
View File

@ -235,8 +235,8 @@ ifneq ($(android),)
-D__DARWIN_UNIX03=1 \ -D__DARWIN_UNIX03=1 \
-D__PROVIDE_FIXMES \ -D__PROVIDE_FIXMES \
-DSTATIC_LIB \ -DSTATIC_LIB \
-D__STDC_FORMAT_MACROS=1 \
-g3 \ -g3 \
-Werror \
-Wno-shift-count-overflow -Wno-shift-count-overflow
# on Windows (in MinGW-based build) there are neither __BEGIN_DECLS nor __END_DECLS # on Windows (in MinGW-based build) there are neither __BEGIN_DECLS nor __END_DECLS
@ -270,7 +270,7 @@ ifneq ($(android),)
icu-libs := $(android)/external/icu4c/lib/libsicuin.a \ icu-libs := $(android)/external/icu4c/lib/libsicuin.a \
$(android)/external/icu4c/lib/libsicuuc.a \ $(android)/external/icu4c/lib/libsicuuc.a \
$(android)/external/icu4c/lib/sicudt.a $(android)/external/icu4c/lib/sicudt.a
platform-lflags := -lgdi32 -lshlwapi -lwsock32 platform-lflags := -lgdi32 -lshlwapi -lwsock32 -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic
else else
android-cflags += -fPIC -DHAVE_SYS_UIO_H -DHAVE_POSIX_FILEMAP android-cflags += -fPIC -DHAVE_SYS_UIO_H -DHAVE_POSIX_FILEMAP
blacklist = blacklist =
@ -1862,7 +1862,7 @@ else
$(dlltool) -z $(addsuffix .def,$(basename $(@))) $(^) $(dlltool) -z $(addsuffix .def,$(basename $(@))) $(^)
$(dlltool) -d $(addsuffix .def,$(basename $(@))) -e $(addsuffix .exp,$(basename $(@))) $(dlltool) -d $(addsuffix .def,$(basename $(@))) -e $(addsuffix .exp,$(basename $(@)))
$(ld) $(addsuffix .exp,$(basename $(@))) $(^) \ $(ld) $(addsuffix .exp,$(basename $(@))) $(^) \
$(lflags) $(bootimage-lflags) -o $(@) $(lflags) $(classpath-lflags) $(bootimage-lflags) -o $(@)
endif endif
$(strip) $(strip-all) $(@) $(strip) $(strip-all) $(@)