propset svn:eol-style native

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@146 1a98c847-1fd6-4fd8-948a-caf3550aa51b

1 files changed, 72 insertions, 72 deletions

diff --git a/makefile.osx b/makefile.osx
index 5322f29d13..7894d055d2 100644
--- a/makefile.osx
+++ b/makefile.osx
@@ -1,72 +1,72 @@
-# Copyright (c) 2009-2010 Satoshi Nakamoto

-# Distributed under the MIT/X11 software license, see the accompanying

-# file license.txt or http://www.opensource.org/licenses/mit-license.php.

-

-# Mac OS X makefile for bitcoin

-# Laszlo Hanyecz (solar@heliacal.net)

-

-CXX=llvm-g++

-DEPSDIR=/Users/macosuser/bitcoin/deps

-

-INCLUDEPATHS= \

- -I"$(DEPSDIR)/include"

-

-LIBPATHS= \

- -L"$(DEPSDIR)/lib"

-

-WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)

-

-LIBS= -dead_strip \

- $(DEPSDIR)/lib/libdb_cxx-4.8.a \

- $(DEPSDIR)/lib/libboost_system.a \

- $(DEPSDIR)/lib/libboost_filesystem.a \

- $(DEPSDIR)/lib/libboost_program_options.a \

- $(DEPSDIR)/lib/libboost_thread.a \

- $(DEPSDIR)/lib/libcrypto.a 

-

-DEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -D__WXMAC_OSX__ -DNOPCH -DMSG_NOSIGNAL=0

-

-DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0

-# ppc doesn't work because we don't support big-endian

-CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O3 -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

-

-OBJS= \

-    obj/util.o \

-    obj/script.o \

-    obj/db.o \

-    obj/net.o \

-    obj/irc.o \

-    obj/main.o \

-    obj/rpc.o \

-    obj/init.o \

-    cryptopp/obj/sha.o \

-    cryptopp/obj/cpu.o

-	

-

-all: bitcoin

-

-

-obj/%.o: %.cpp $(HEADERS)

-	$(CXX) -c $(CFLAGS) -DGUI -o $@ $<

-

-cryptopp/obj/%.o: cryptopp/%.cpp

-	$(CXX) -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $<

-

-bitcoin: $(OBJS) obj/ui.o obj/uibase.o

-	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)

-

-

-obj/nogui/%.o: %.cpp $(HEADERS)

-	$(CXX) -c $(CFLAGS) -o $@ $<

-

-bitcoind: $(OBJS:obj/%=obj/nogui/%)

-	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)

-

-

-clean:

-	-rm -f bitcoin bitcoind

-	-rm -f obj/*.o

-	-rm -f obj/nogui/*.o

-	-rm -f cryptopp/obj/*.o

+# Copyright (c) 2009-2010 Satoshi Nakamoto
+# Distributed under the MIT/X11 software license, see the accompanying
+# file license.txt or http://www.opensource.org/licenses/mit-license.php.
+
+# Mac OS X makefile for bitcoin
+# Laszlo Hanyecz (solar@heliacal.net)
+
+CXX=llvm-g++
+DEPSDIR=/Users/macosuser/bitcoin/deps
+
+INCLUDEPATHS= \
+ -I"$(DEPSDIR)/include"
+
+LIBPATHS= \
+ -L"$(DEPSDIR)/lib"
+
+WXLIBS=$(shell $(DEPSDIR)/bin/wx-config --libs --static)
+
+LIBS= -dead_strip \
+ $(DEPSDIR)/lib/libdb_cxx-4.8.a \
+ $(DEPSDIR)/lib/libboost_system.a \
+ $(DEPSDIR)/lib/libboost_filesystem.a \
+ $(DEPSDIR)/lib/libboost_program_options.a \
+ $(DEPSDIR)/lib/libboost_thread.a \
+ $(DEPSDIR)/lib/libcrypto.a 
+
+DEFS=$(shell $(DEPSDIR)/bin/wx-config --cxxflags) -D__WXMAC_OSX__ -DNOPCH -DMSG_NOSIGNAL=0
+
+DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0
+# ppc doesn't work because we don't support big-endian
+CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -O3 -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
+
+OBJS= \
+    obj/util.o \
+    obj/script.o \
+    obj/db.o \
+    obj/net.o \
+    obj/irc.o \
+    obj/main.o \
+    obj/rpc.o \
+    obj/init.o \
+    cryptopp/obj/sha.o \
+    cryptopp/obj/cpu.o
+	
+
+all: bitcoin
+
+
+obj/%.o: %.cpp $(HEADERS)
+	$(CXX) -c $(CFLAGS) -DGUI -o $@ $<
+
+cryptopp/obj/%.o: cryptopp/%.cpp
+	$(CXX) -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_ASM -o $@ $<
+
+bitcoin: $(OBJS) obj/ui.o obj/uibase.o
+	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+
+
+obj/nogui/%.o: %.cpp $(HEADERS)
+	$(CXX) -c $(CFLAGS) -o $@ $<
+
+bitcoind: $(OBJS:obj/%=obj/nogui/%)
+	$(CXX) $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
+
+
+clean:
+	-rm -f bitcoin bitcoind
+	-rm -f obj/*.o
+	-rm -f obj/nogui/*.o
+	-rm -f cryptopp/obj/*.o