Merge branch 'master' into testing

NordicFlyer · Apr 29, 2018 · f7d4cae · f7d4cae
2 parents 82ecd02 + f28e0f2
commit f7d4cae
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lightcrafts/jnisrc/EDISON/GNUmakefile b/lightcrafts/jnisrc/EDISON/GNUmakefile
@@ -19,7 +19,7 @@ include			../jni.mk
 
 SEGM_SOURCE:=		segm/ms.cpp segm/msSys.cpp segm/msImageProcessor.cpp segm/RAList.cpp segm/rlist.cpp $(wildcard *.cpp)
 SEGM_INCLUDES:=		segm/tdef.h segm/RAList.h segm/ms.h segm/msImageProcessor.h segm/msSys.h segm/rlist.h
-SEGM_LDFLAGS:=		$(filter-out $(PLATFORM_LDFLAGS),$(LDFLAGS))
+SEGM_LDFLAGS:=		$(PLATFORM_LDFLAGS)
 
 ifeq ($(UNIVERSAL),1)
 $(TARGET_PPC) $(TARGET_X86): $(SEGM_SOURCE) $(SEGM_INCLUDES)