From 6853e627f12de21b38a178def14c067435517d96 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Fri, 7 Oct 2011 11:02:21 -0400 Subject: Fix build on windows and mac Replaced all occurrences of #if* __WXMSW__ with WIN32, and all occurrences of __WXMAC_OSX__ with MAC_OSX, and made sure those are defined appropriately in the makefile and bitcoin-qt.pro. --- src/makefile.osx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/makefile.osx') diff --git a/src/makefile.osx b/src/makefile.osx index 74af308759..6269d93bda 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -28,7 +28,7 @@ LIBS= -dead_strip \ -lssl \ -lcrypto -DEFS=-DMSG_NOSIGNAL=0 -DUSE_SSL +DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_SSL DEBUGFLAGS=-g # ppc doesn't work because we don't support big-endian @@ -73,7 +73,7 @@ ifdef USE_UPNP LIBS += -lminiupnpc DEFS += -DUSE_UPNP=$(USE_UPNP) endif - + all: bitcoind -- cgit v1.2.3