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. --- bitcoin-qt.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitcoin-qt.pro') diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 9b2a193acc..6b1fb7f6cf 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -211,10 +211,10 @@ isEmpty(BOOST_INCLUDE_PATH) { } windows:LIBS += -lws2_32 -lgdi32 -windows:DEFINES += __WXMSW__ +windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc -macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 +macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 macx:ICON = src/qt/res/icons/bitcoin.icns macx:TARGET = "Bitcoin Qt" -- cgit v1.2.3