43 lines
1.0 KiB
Plaintext
43 lines
1.0 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.5 2018/04/27 14:59:43 bcallah Exp $
|
|
Index: Makefile
|
|
--- Makefile.orig
|
|
+++ Makefile
|
|
@@ -18,13 +18,13 @@ SRC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $(
|
|
vpath %.cpp $(SRC_DIRS)
|
|
|
|
INC_DIRS = $(COMMON_DIR) $(UNIX_DIR) $(DERIVED_DIR) $(AGG_DIR)/include $(COMMON_DIR)/agg-extras $(FFMPEG_DIR)/include
|
|
-INC_DIRS += /usr/local/include
|
|
+INC_DIRS += $(LOCALBASE)/include
|
|
|
|
#
|
|
# Library directories for FFmpeg and libpng
|
|
#
|
|
|
|
-LIB_DIRS = $(FFMPEG_DIR)/lib /usr/local/lib
|
|
+LIB_DIRS = $(FFMPEG_DIR)/lib $(LOCALBASE)/lib
|
|
|
|
#
|
|
# Sources and Objects
|
|
@@ -52,7 +52,11 @@ LIBS = png z m
|
|
ifeq ($(shell uname -s), Darwin)
|
|
LIBS += c++
|
|
else
|
|
- LIBS += stdc++
|
|
+ ifeq ($(shell uname -s), OpenBSD)
|
|
+ LIBS += $(LIBCXX)
|
|
+ else
|
|
+ LIBS += stdc++
|
|
+ endif
|
|
endif
|
|
|
|
#
|
|
@@ -143,7 +147,7 @@ test: cfdg
|
|
#
|
|
|
|
CPPFLAGS += $(patsubst %,-I%,$(INC_DIRS))
|
|
-CPPFLAGS += -O3 -Wall -Wextra -march=native -Wno-parentheses -std=c++14
|
|
+CPPFLAGS += -Wall -Wextra -Wno-parentheses -std=c++14
|
|
#CPPFLAGS += -g
|
|
|
|
# Add this for clang
|