ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #352 from bigfatbrowncat/avian-pack

Browse Source 
Small fix for Android build on Windows
This commit is contained in:
Joel Dice 2014-10-09 15:48:41 -06:00
commit e7e54ad52b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@ -240,12 +240,14 @@ ifneq ($(android),)
-g3 \ -g3 \
-Werror \ -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
# defines; we don't want to patch every file that uses them, so we stub them in # defines; we don't want to patch every file that uses them, so we stub them in
# using CFLAGS mechanism # using CFLAGS mechanism
# Also we have off64_t defined in mingw-w64 headers, so let's tell that
ifeq ($(platform),windows) ifeq ($(platform),windows)
android-cflags += "-D__BEGIN_DECLS=extern \"C\" {" "-D__END_DECLS=}" android-cflags += "-D__BEGIN_DECLS=extern \"C\" {" "-D__END_DECLS=}" "-DHAVE_OFF64_T"
endif endif
luni-cpps := $(shell find $(luni-native) -name '*.cpp') luni-cpps := $(shell find $(luni-native) -name '*.cpp')