summaryrefslogtreecommitdiff
blob: a8d1fa908013567ab139d624becfa7de5291dd97 (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
--- libxorgedit/Makefile	2008-08-05 18:46:23.000000000 +0200
+++ libxorgedit/Makefile.new	2009-08-15 17:52:26.000000000 +0200
@@ -6,10 +6,10 @@
 OUTPUT = ../libxorgedit.a
 
 # compiler
-CXX = g++
+CXX ?= g++
 
 # C++ compiler flags (-g -O2 -Wall)
-CXXFLAGS = -Wall -Wextra -O3
+#CXXFLAGS = -Wall -Wextra -O3
 
 # implementation
 
--- xorgedit/Makefile	2008-08-06 20:29:54.000000000 +0200
+++ xorgedit/Makefile.new	2009-08-15 20:11:11.000000000 +0200
@@ -18,23 +18,23 @@
 INCLUDES = -I../
 
 # C++ compiler flags (-g -O2 -Wall)
-CXXFLAGS = `wx-config --cxxflags` -O3
+CXXFLAGS += `wx-config --cxxflags`
 
 # compiler
-CXX = `wx-config --cxx`
+CXX ?= `wx-config --cxx`
 
 # library paths
-LIBS = -L../ -lm -lxorgedit
+LIBS = -L../ -lm -lxorgedit `wx-config --libs`
 
 # compile flags
-LDFLAGS = `wx-config --libs`
+#LDFLAGS = `wx-config --libs`
 
 # implementation
 
 all: $(OUTPUT)
 
 $(OUTPUT): $(OBJECTS)
-	$(CXX) -o $(OUTPUT) $(OBJECTS) $(LIBS) $(LDFLAGS)
+	$(CXX) $(LDFLAGS) -o $(OUTPUT) $(OBJECTS) $(LIBS)
 
 $(OBJECTS): $(SOURCES)
 	$(CXX) $(INCLUDES) -c $(SOURCES) $(CXXFLAGS)