summaryrefslogtreecommitdiff
path: root/games/wxhugo/patches/patch-aa
blob: f91653b1abc73100b7c767e029808cec6b7dc099 (plain)
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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
$NetBSD: patch-aa,v 1.3 2005/01/10 19:43:54 dillo Exp $

--- Makefile.orig	2004-08-07 21:32:02.000000000 +0200
+++ Makefile
@@ -15,12 +15,12 @@
 # (The wxWindows file locations should really be taken from wx-config.)
 HUGOSOURCEDIR = ../source
 MIKMODINCLUDEDIR = /usr/local/include
-CXXINCLUDEDIR = /usr/include/g++-3
+#CXXINCLUDEDIR = /usr/include/g++-3
 
 # Libraries to be linked:
 # If a working libmikmod.so has been compiled on the runtime system
 # and the wxGTK library is installed:
-LDFLAGS = `wx-config --libs` -lgtk -lgdk -lmikmod
+LDFLAGS += `wx-config --libs` -lmikmod
 STATICLIBS =
 # Otherwise, use these LDFLAGS and STATICLIBS:
 #LDFLAGS = -lwx_gtk -lgtk -lgdk -lpthread -lmikmod
@@ -34,7 +34,7 @@ MYCODEDIR := .
 
 # Directories to search for header files
 
-SEARCHDIRS := -I- -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR} -I${CXXINCLUDEDIR}
+SEARCHDIRS := -I${MYCODEDIR} -I${HUGOSOURCEDIR} -I${MIKMODINCLUDEDIR}
 
 # makemake variables
 
@@ -44,17 +44,18 @@ TOUCHHEADERS := ${MYCODEDIR}/*.h
 
 # C
 
-CC     := gcc
+#CC     := gcc
 # Debugging:
 #CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -fwritable-strings -g3 -Wall `wx-config --cflags`
 # Release build:
-CFLAGS  = ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET -fwritable-strings -O2 -Wall `wx-config --cflags`
+CPPFLAGS  += ${DEPENDFLAGS} -D__WXGTK__ -DWXWINDOWS -DNO_WXCARET
+CFLAGS  += -fwritable-strings `wx-config --cflags`
 
 # C++
 
-CXX      := g++
+#CXX      := g++
 #CXXFLAGS  = ${DEPENDFLAGS}
-CXXFLAGS = ${CFLAGS} -fno-rtti
+CXXFLAGS += ${CFLAGS} -fno-rtti
 
 %.o : %.cpp
 	${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS}
@@ -64,7 +65,7 @@ CXXFLAGS = ${CFLAGS} -fno-rtti
 
 # C preprocessor
 
-CPPFLAGS = 
+#CPPFLAGS = 
 
 # linker