Fix CRLF

1 files changed, 76 insertions, 76 deletions

diff --git a/makefile.mingw b/makefile.mingw
index ee63d11ead..35a63a847a 100644
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -1,76 +1,76 @@
-# 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.

-

-

-# for wxWidgets-2.8.x, search and replace "mswud"->"mswd" and "29u"->"28"

-

-INCLUDEPATHS= \

- -I"/boost" \

- -I"/db/build_unix" \

- -I"/openssl/include" \

- -I"/wxwidgets/lib/gcc_lib/mswud" \

- -I"/wxwidgets/include"

-

-LIBPATHS= \

- -L"/boost/stage/lib" \

- -L"/db/build_unix" \

- -L"/openssl/out" \

- -L"/wxwidgets/lib/gcc_lib"

-

-WXLIBS= \

- -l wxmsw29ud_html -l wxmsw29ud_core -l wxmsw29ud_adv -l wxbase29ud -l wxtiffd -l wxjpegd -l wxpngd -l wxzlibd

-

-LIBS= \

- -l libboost_system-mgw34-mt-d -l libboost_filesystem-mgw34-mt-d \

- -l db_cxx \

- -l eay32 \

- -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi

-

-WXDEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH

-DEBUGFLAGS=-g -D__WXDEBUG__

-CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(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 init.h sha.h

-

-

-all: bitcoin.exe

-

-

-headers.h.gch: headers.h $(HEADERS)

-	g++ -c $(CFLAGS) -o $@ $<

-

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

-	g++ -c $(CFLAGS) -o $@ $<

-

-obj/sha.o: sha.cpp sha.h

-	g++ -c $(CFLAGS) -O3 -o $@ $<

-

-obj/ui_res.o: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp

-	windres $(WXDEFS) $(INCLUDEPATHS) -o $@ -i $<

-

-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

-

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

-	g++ $(CFLAGS) -mwindows -Wl,--subsystem,windows -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)

-

-

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

-	g++ -c $(CFLAGS) -DwxUSE_GUI=0 -o $@ $<

-

-bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/sha.o obj/ui_res.o

-	g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -l wxbase29ud $(LIBS)

-

-

-clean:

-	-del /Q obj\*

-	-del /Q obj\nogui\*

-	-del /Q headers.h.gch

+# 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.
+
+
+# for wxWidgets-2.8.x, search and replace "mswud"->"mswd" and "29u"->"28"
+
+INCLUDEPATHS= \
+ -I"/boost" \
+ -I"/db/build_unix" \
+ -I"/openssl/include" \
+ -I"/wxwidgets/lib/gcc_lib/mswud" \
+ -I"/wxwidgets/include"
+
+LIBPATHS= \
+ -L"/boost/stage/lib" \
+ -L"/db/build_unix" \
+ -L"/openssl/out" \
+ -L"/wxwidgets/lib/gcc_lib"
+
+WXLIBS= \
+ -l wxmsw29ud_html -l wxmsw29ud_core -l wxmsw29ud_adv -l wxbase29ud -l wxtiffd -l wxjpegd -l wxpngd -l wxzlibd
+
+LIBS= \
+ -l libboost_system-mgw34-mt-d -l libboost_filesystem-mgw34-mt-d \
+ -l db_cxx \
+ -l eay32 \
+ -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
+
+WXDEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH
+DEBUGFLAGS=-g -D__WXDEBUG__
+CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(WXDEFS) $(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 init.h sha.h
+
+
+all: bitcoin.exe
+
+
+headers.h.gch: headers.h $(HEADERS)
+	g++ -c $(CFLAGS) -o $@ $<
+
+obj/%.o: %.cpp $(HEADERS) headers.h.gch
+	g++ -c $(CFLAGS) -o $@ $<
+
+obj/sha.o: sha.cpp sha.h
+	g++ -c $(CFLAGS) -O3 -o $@ $<
+
+obj/ui_res.o: ui.rc  rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp
+	windres $(WXDEFS) $(INCLUDEPATHS) -o $@ -i $<
+
+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
+
+bitcoin.exe: $(OBJS) obj/ui.o obj/uibase.o obj/sha.o obj/ui_res.o
+	g++ $(CFLAGS) -mwindows -Wl,--subsystem,windows -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+
+
+obj/nogui/%.o: %.cpp $(HEADERS)
+	g++ -c $(CFLAGS) -DwxUSE_GUI=0 -o $@ $<
+
+bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/sha.o obj/ui_res.o
+	g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -l wxbase29ud $(LIBS)
+
+
+clean:
+	-del /Q obj\*
+	-del /Q obj\nogui\*
+	-del /Q headers.h.gch