reverted makefile.unix wx-config -- version 0.3.6

[novacoin.git] / makefile.unix

diff --git a/makefile.unix b/makefile.unix
index e393ff9..597a0ea 100644 (file)
--- a/makefile.unix
+++ b/makefile.unix
@@ -3,12 +3,21 @@
 # file license.txt or http://www.opensource.org/licenses/mit-license.php.\r
 \r
 \r
-WXLIBS=$(shell wx-config --debug=yes --libs --static)\r
-WXFLAGS=$(shell wx-config --debug=yes --cppflags)\r
+INCLUDEPATHS= \\r
+ -I"/usr/include" \\r
+ -I"/usr/local/include/wx-2.9" \\r
+ -I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9"\r
 \r
 LIBPATHS= \\r
+ -L"/usr/lib" \\r
  -L"/usr/local/lib"\r
 \r
+WXLIBS= \\r
+ -Wl,-Bstatic \\r
+   -l wx_gtk2ud-2.9 \\r
+ -Wl,-Bdynamic \\r
+   -l gtk-x11-2.0 -l SM\r
+\r
 LIBS= \\r
  -Wl,-Bstatic \\r
    -l boost_system \\r
@@ -22,7 +31,7 @@ LIBS= \
 \r
 DEFS=-D__WXGTK__ -DNOPCH\r
 DEBUGFLAGS=-g -D__WXDEBUG__\r
-CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)\r
+CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)\r
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \\r
     script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h\r
 \r
@@ -43,10 +52,10 @@ all: bitcoin
 \r
 \r
 headers.h.gch: headers.h $(HEADERS)\r
-       g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $<\r
+       g++ -c $(CFLAGS) -DGUI -o $@ $<\r
 \r
 obj/%.o: %.cpp $(HEADERS) headers.h.gch\r
-       g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $<\r
+       g++ -c $(CFLAGS) -DGUI -o $@ $<\r
 \r
 cryptopp/obj/%.o: cryptopp/%.cpp\r
        g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_SSE2 -o $@ $<\r