Merge branch 'master' into testing

lightcrafts/jnisrc/jni.mk

@@ -49,10 +49,8 @@
 ##
 # Undefine all this stuff so we don't get any defaults.
 ##
-CFLAGS=
 DEFINES:=
 INCLUDES:=
-LDFLAGS:=
 LINK:=
 
 COMMON_DIR:=		$(ROOT)/lightcrafts

lightcrafts/mk/executable.mk

@@ -44,10 +44,8 @@ EXECUTABLE:=1
 ##
 # Undefine all this stuff so we don't get any defaults.
 ##
-CFLAGS:=
 DEFINES:=
 INCLUDES:=
-LDFLAGS:=
 LINK:=
 
 COMMON_DIR:=		$(ROOT)/lightcrafts
@@ -61,7 +59,7 @@ else
 endif
 
 DEFINES:=		$(EXEC_EXTRA_DEFINES)
-INCLUDES:=		$(EXEC_EXTRA_INCLUDES)
+INCLUDES:=		$(PLATFORM_INCLUDES) $(EXEC_EXTRA_INCLUDES)
 LDFLAGS:=		$(PLATFORM_LDFLAGS) -L$(COMMON_DIR)/products \
 			$(EXEC_EXTRA_LDFLAGS)
 LINK:=			$(EXEC_EXTRA_LINK)

lightcrafts/mk/platform.mk

@@ -50,8 +50,9 @@ ifneq ($(USE_ICC),1)
   USE_ICC_HERE:=
 endif
 
-# The initial set of CFLAGS.  (Must not use := here!)
-PLATFORM_CFLAGS=	-g
+# The initial set of CFLAGS and LDFLAGS.  (Must not use := here!)
+PLATFORM_CFLAGS=	$(CFLAGS) -g
+PLATFORM_LDFLAGS=	$(LDFLAGS)
 
 # Default symlink command.  This needs to be defined as a function variable
 # rather than just a simple variable because of the way it's overridden for
@@ -103,7 +104,7 @@ ifeq ($(PLATFORM),MacOSX)
     MACOSX_ISYSROOT=
     MACOSX_SYSLIBROOT=
   endif
-  PLATFORM_LDFLAGS=	$(MACOSX_SYSLIBROOT)
+  PLATFORM_LDFLAGS+=	$(MACOSX_SYSLIBROOT)
 
   ##
   # These are to be only the bare minimum architecture-specific CFLAGS.  High-
@@ -305,7 +306,7 @@ ifeq ($(PLATFORM),$(filter $(PLATFORM),Linux FreeBSD SunOS))
     JAVA_INCLUDES:=	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/freebsd
     NUM_PROCESSORS:=	$(shell dmesg | grep '^cpu' | wc -l)
     PLATFORM_INCLUDES=	-I/usr/local/include
-    PLATFORM_LDFLAGS=	-L/usr/local/lib
+    PLATFORM_LDFLAGS+=	-L/usr/local/lib
   else ifeq ($(PLATFORM),SunOS)
     JAVA_INCLUDES:=	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/solaris
     NUM_PROCESSORS:=	$(shell psrinfo -p)