Skip to content

Develop fix r8b mingw #1499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 3, 2012
Merged

Develop fix r8b mingw #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c38b510
Windows patch for openFrameworks
falcon4ever Aug 21, 2012
3d5450a
Reverted the 'fix' for Mac/Linux builds as it causes the examples not…
falcon4ever Aug 21, 2012
6b83359
Added -fuse-ld=gold parameter to LDFLAGS for Mac/Linux platform
falcon4ever Aug 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion libs/openFrameworksCompiled/project/android/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ ifeq ($(findstring Android,$(MAKECMDGOALS)),Android)
ARCH = android
ifeq ($(shell uname),Darwin)
HOST_PLATFORM = darwin-x86
else ifeq ($(shell uname),MINGW32_NT-6.1)
HOST_PLATFORM = windows
else
HOST_PLATFORM = linux-x86
endif
Expand All @@ -33,7 +35,7 @@ endif
ifeq ($(ARCH),android)
COMPILER_OPTIMIZATION = -Os
NDK_PLATFORM = android-8
GCC_VERSION = 4.4.3
GCC_VERSION = 4.6
else
ifeq ($(ARCH),armv7l)
COMPILER_OPTIMIZATION = -march=armv7-a -mtune=cortex-a8 -finline-functions -funroll-all-loops -O3 -funsafe-math-optimizations -mfpu=neon -ftree-vectorize -mfloat-abi=softfp
Expand Down
11 changes: 7 additions & 4 deletions libs/openFrameworksCompiled/project/makefileCommon/Makefile.android
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ INCLUDES_FLAGS += -I$(OF_ROOT)/libs/glu/include_android


LDFLAGS = --sysroot=$(SYSROOT) -nostdlib -L"$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/libs/$(ABI)"
ifneq ($(shell uname),MINGW32_NT-6.1)
LDFLAGS += -fuse-ld=gold
endif
SYSTEMLIBS += -lsupc++ -lz -lGLESv1_CM -llog -ldl -lm -lc $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/libs/$(ABI)/libgnustl_static.a -lgcc
LIB_STATIC += $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoNet.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoXML.a $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoFoundation.a
#LIB_STATIC += $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libsndfile.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libcommon.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libgsm.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libg72x.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libFLAC.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libreplaygain_synthesis.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libreplaygain_analysis.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libgrabbag.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libgrabbag.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libgetopt.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libutf8.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libvorbis.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libvorbisfile.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libvorbisenc.a $(OF_ROOT)/libs/libsndfile/lib/$(LIBSPATH)/libogg.a
Expand All @@ -40,30 +43,30 @@ LIB_STATIC += $(OF_ROOT)/libs/poco/lib/$(LIBSPATH)/libPocoNet.a $(OF_ROOT)/libs/
ifeq ($(findstring Debug,$(MAKECMDGOALS)),Debug)
TARGET_NAME = Debug
TARGET = libs/armeabi/libOFAndroidApp.so
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined -fuse-ld=gold
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined
USER_LIBS = $(USER_LIBS_ARM)
endif

ifeq ($(findstring Release,$(MAKECMDGOALS)),Release)
TARGET_NAME = Release
TARGET = libs/armeabi/libOFAndroidApp.so
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined -fuse-ld=gold
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined
USER_LIBS = $(USER_LIBS_ARM)
endif

ifeq ($(findstring Release_arm7,$(MAKECMDGOALS)),Release_arm7)
TARGET_NAME = Release_arm7
TARGET_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb
TARGET = libs/armeabi-v7a/libOFAndroidApp.so
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined -fuse-ld=gold
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined
USER_LIBS = $(USER_LIBS_ARM7)
endif

ifeq ($(findstring Release_neon,$(MAKECMDGOALS)),Release_neon)
TARGET_NAME = Release_neon
TARGET_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=neon
TARGET = libs/armeabi-v7a/libOFAndroidApp_neon.so
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined -fuse-ld=gold
LDFLAGS += -Wl,--fix-cortex-a8 -shared -Wl,--no-undefined
USER_LIBS = $(USER_LIBS_NEON)
TARGET_LIBS = $(OF_ROOT)/libs/openFrameworksCompiled/lib/android/armeabi-neon/libopenFrameworks.a
endif
Expand Down