Skip to content
Browse files

makefiles android: don't include som source files + don't use gold li…

…nker in osx
  • Loading branch information...
1 parent 353af33 commit 9bbdf2149b9c3885e7e44f82e164341654536f3e @arturoc arturoc committed
View
2 libs/openFrameworksCompiled/project/android/makefile
@@ -97,7 +97,7 @@ endif
SOURCE_DIRS = $(shell find ../../../openFrameworks -maxdepth 1 -mindepth 1 -type d )
ifeq ($(ARCH),android)
- SOURCES = $(shell find $(SOURCE_DIRS) -name "*.cpp" | grep -v "ofAppGlutWindow.cpp" | grep -v ofGstVideoPlayer.cpp | grep -v ofQuickTimeGrabber.cpp | grep -v ofGstVideoGrabber.cpp | grep -v ofOpenALSoundPlayer.cpp)
+ SOURCES = $(shell find $(SOURCE_DIRS) -name "*.cpp" | grep -v "ofAppGlutWindow.cpp" | grep -v ofGstVideoPlayer.cpp | grep -v ofQuickTimeGrabber.cpp | grep -v ofGstVideoGrabber.cpp | grep -v ofOpenALSoundPlayer.cpp | grep -v "ofCairoRenderer.cpp" | grep -v "ofFmodSoundPlayer.cpp")
@bilderbuchi openFrameworks member

curious, why the " for some files, but not all - does it make an actual difference?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
else
SOURCES = $(shell find $(SOURCE_DIRS) -name "*.cpp")
endif
View
2 libs/openFrameworksCompiled/project/makefileCommon/Makefile.android
@@ -31,7 +31,7 @@ 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)
+ifeq ($(HOST_PLATFORM),linux-x86)
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

0 comments on commit 9bbdf21

Please sign in to comment.
Something went wrong with that request. Please try again.