Permalink
Browse files

reverted makefile.unix wx-config -- version 0.3.6

  • Loading branch information...
1 parent ec82517 commit a75560d828464c3f1138f52cf247e956fc8f937d --author=Satoshi Nakamoto committed with gavinandresen Jul 30, 2010
Showing with 718 additions and 655 deletions.
  1. +2 −1 bignum.h
  2. +14 −5 makefile.unix
  3. +671 −643 script.cpp
  4. +26 −1 script.h
  5. +2 −2 serialize.h
  6. +3 −3 setup.nsi
View
@@ -401,7 +401,8 @@ class CBigNum : public BIGNUM
CBigNum& operator>>=(unsigned int shift)
{
- // Note: BN_rshift segfaults on 64-bit ubuntu 9.10 if 2^shift is greater than the number
+ // Note: BN_rshift segfaults on 64-bit ubuntu 9.10 if 2^shift is greater than the number,
+ // tested OK on 64-bit ubuntu 10.4
if (!BN_rshift(this, this, shift))
throw bignum_error("CBigNum:operator>>= : BN_rshift failed");
return *this;
View
@@ -3,12 +3,21 @@
# file license.txt or http://www.opensource.org/licenses/mit-license.php.
-WXLIBS=$(shell wx-config --debug=yes --libs --static)
-WXFLAGS=$(shell wx-config --debug=yes --cppflags)
+INCLUDEPATHS= \
+ -I"/usr/include" \
+ -I"/usr/local/include/wx-2.9" \
+ -I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9"
LIBPATHS= \
+ -L"/usr/lib" \
-L"/usr/local/lib"
+WXLIBS= \
+ -Wl,-Bstatic \
+ -l wx_gtk2ud-2.9 \
+ -Wl,-Bdynamic \
+ -l gtk-x11-2.0 -l SM
+
LIBS= \
-Wl,-Bstatic \
-l boost_system \
@@ -22,7 +31,7 @@ LIBS= \
DEFS=-D__WXGTK__ -DNOPCH
DEBUGFLAGS=-g -D__WXDEBUG__
-CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)
+CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
@@ -43,10 +52,10 @@ all: bitcoin
headers.h.gch: headers.h $(HEADERS)
- g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $<
+ g++ -c $(CFLAGS) -DGUI -o $@ $<
obj/%.o: %.cpp $(HEADERS) headers.h.gch
- g++ -c $(CFLAGS) $(WXFLAGS) -DGUI -o $@ $<
+ g++ -c $(CFLAGS) -DGUI -o $@ $<
cryptopp/obj/%.o: cryptopp/%.cpp
g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_SSE2 -o $@ $<
Oops, something went wrong.

0 comments on commit a75560d

Please sign in to comment.