blob: b0022b62df36e41788835083eb328d82fc25eefd (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- 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)
@@ -199,6 +200,10 @@
ZLIB_LDLIBS += -lz
endif
+ifeq ($(OS), FREEBSD) # use system zlib on FreeBSD
+ ZLIB_LDLIBS += -lz
+endif
+
ifeq ($(origin ZLIB_CFLAGS) $(origin ZLIB_LDLIBS), undefined undefined)
ifeq ($(shell $(PKG_CONFIG) --modversion zlib 2>/dev/null),)
$(error No zlib development libraries found!)
@@ -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
|
