c7cd5003bb
- link with CXX
57 lines
2.5 KiB
Plaintext
57 lines
2.5 KiB
Plaintext
$OpenBSD: patch-Makefile,v 1.4 2002/09/28 15:24:00 naddy Exp $
|
|
--- Makefile.orig Wed Mar 28 11:11:39 2001
|
|
+++ Makefile Sat Sep 28 17:25:07 2002
|
|
@@ -3,8 +3,7 @@
|
|
#===============
|
|
|
|
# Install Paths
|
|
-PREFIX := /usr/local
|
|
-INSTALL_DIR := ${PREFIX}/games/amph
|
|
+INSTALL_DIR := ${PREFIX}/share/amph
|
|
|
|
# Endianess:
|
|
# LITTLE_ENDIAN (for Intel)
|
|
@@ -15,7 +14,7 @@ BYTE_ORDER := LITTLE_ENDIAN
|
|
USE_LIB_XPM := TRUE
|
|
|
|
SDL_CONFIG := sdl-config
|
|
-SDL_HEADERS := $(shell $(SDL_CONFIG) --cflags)
|
|
+SDL_HEADERS := $(shell $(SDL_CONFIG) --cflags) -I${X11BASE}/include
|
|
SDL_LIBS := $(shell $(SDL_CONFIG) --libs)
|
|
|
|
#=======================================================
|
|
@@ -31,19 +30,19 @@ SEARCHDIRS := -I${MYCODEDIR} ${SDL_HEADE
|
|
|
|
# makemake variables
|
|
|
|
-LINKER := g++
|
|
+LINKER := ${CXX}
|
|
DEPENDFLAGS := -g ${SEARCHDIRS}
|
|
TOUCHHEADERS := ${MYCODEDIR}/*.h
|
|
|
|
# C
|
|
|
|
-CC := gcc
|
|
-CFLAGS = ${DEPENDFLAGS}
|
|
+CC ?= gcc
|
|
+CFLAGS += ${DEPENDFLAGS}
|
|
|
|
# C++
|
|
|
|
-CXX := g++
|
|
-CXXFLAGS = ${DEPENDFLAGS} -O9 -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
|
|
+CXX ?= g++
|
|
+CXXFLAGS += ${DEPENDFLAGS} -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
|
|
|
|
%.o : %.cpp
|
|
${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS} -o $@
|
|
@@ -204,7 +203,7 @@ jdepend:
|
|
|
|
./src/Surface.o: ./src/AmpHead.hpp ./src/Clut.hpp ./src/ConstVal.hpp ./src/Graphfil.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h
|
|
|
|
-./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp /usr/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h
|
|
+./src/System.o: ./src/AmpHead.hpp ./src/Graphfil.hpp ./src/System.hpp /usr/X11R6/include/X11/xpm.h /usr/include/fcntl.h /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h /usr/include/string.h /usr/include/sys/stat.h /usr/include/sys/time.h /usr/include/sys/types.h /usr/include/unistd.h
|
|
|
|
./src/Thing.o: ./src/AmpHead.hpp ./src/Appl.hpp ./src/Bullet.hpp ./src/ConstVal.hpp ./src/Element.hpp ./src/File.hpp ./src/Graphfil.hpp ./src/Level.hpp ./src/ObjInfo.hpp ./src/Object.hpp ./src/Pltform.hpp ./src/Shape.hpp ./src/ShapeLd.hpp ./src/Surface.hpp ./src/System.hpp ./src/Thing.hpp /usr/include/limits.h /usr/include/math.h /usr/include/stdio.h /usr/include/stdlib.h
|
|
|