--- source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2013-07-03 19:28:17.000000000 -0500
+++ source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2013-10-04 04:17:19.000000000 -0500
@@ -125,7 +125,7 @@
 OPTFLAGS ?= -O3 -flto
 WARNFLAGS ?= -Wall
 CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/inc -DGCC
-CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++0x
+CXXFLAGS += -fvisibility-inlines-hidden
 LDFLAGS += $(SHARED)
 BOOST_SUFFIX ?=
 
@@ -186,6 +186,7 @@
 endif
 ifeq ($(OS), FREEBSD)
   LDLIBS += -lc
+  CPPFLAGS += -DNO_FILTER_THREAD
 endif
 
 ifeq ($(origin PKG_CONFIG), undefined)
@@ -292,8 +297,8 @@
 endif
 
 # set base program pointers and flags
-CC        = $(CROSS_COMPILE)gcc
-CXX       = $(CROSS_COMPILE)g++
+CC        ?= $(CROSS_COMPILE)gcc
+CXX       ?= $(CROSS_COMPILE)g++
 RM       ?= rm -f
 INSTALL  ?= install
 MKDIR ?= mkdir -p