X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fmakefile.linux-mingw;h=25be29f982b88e11e63c50c6dc6ffb4377e2fc9b;hb=3176e0f244d929669aa3e1d81e0787d82d9150d3;hp=85d21e1b9f57d3051cc32b18f88958caaecc7ed0;hpb=3120f0d98aff3417292b6993be06b6058563744b;p=novacoin.git

diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 85d21e1..25be29f 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -4,7 +4,7 @@
 
 DEPSDIR:=/usr/i586-mingw32msvc
 
-USE_UPNP:=-
+USE_UPNP:=0
 
 INCLUDEPATHS= \
  -I"$(DEPSDIR)/boost_1_47_0" \
@@ -29,7 +29,7 @@ LIBS= \
 
 DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
 DEBUGFLAGS=-g
-CFLAGS=-O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
+CFLAGS=-O2 -msse2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 
 TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
 
@@ -56,8 +56,6 @@ OBJS= \
     obj/irc.o \
     obj/keystore.o \
     obj/main.o \
-    obj/scrypt_mine.o \
-    obj/scrypt-x86.o \
     obj/net.o \
     obj/protocol.o \
     obj/bitcoinrpc.o \
@@ -67,8 +65,11 @@ OBJS= \
     obj/wallet.o \
     obj/walletdb.o \
     obj/noui.o \
-    obj/pbkdf2.o
-
+    obj/kernel.o \
+    obj/pbkdf2.o \
+    obj/scrypt_mine.o \
+    obj/scrypt-x86.o \
+    obj/scrypt-x86_64.o
 
 all: novacoind.exe
 
@@ -81,11 +82,10 @@ obj/%.o: %.cpp $(HEADERS)
 	i586-mingw32msvc-g++ -c $(CFLAGS) -o $@ $<
 
 obj/scrypt-x86.o: scrypt-x86.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+	i586-mingw32msvc-g++ -c $(CFLAGS) -MMD -o $@ $<
 
 obj/scrypt-x86_64.o: scrypt-x86_64.S
-	$(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
-
+	i586-mingw32msvc-g++ -c $(CFLAGS) -MMD -o $@ $<
 
 novacoind.exe: $(OBJS:obj/%=obj/%)
 	i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
@@ -95,7 +95,7 @@ TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
 obj-test/%.o: test/%.cpp $(HEADERS)
 	i586-mingw32msvc-g++ -c $(TESTDEFS) $(CFLAGS) -o $@ $<
 
-test_bitcoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
+test_novacoin.exe: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%))
 	i586-mingw32msvc-g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ -lboost_unit_test_framework $(LIBS)
 
 
@@ -103,7 +103,7 @@ clean:
 	-rm -f obj/*.o
 	-rm -f novacoind.exe
 	-rm -f obj-test/*.o
-	-rm -f test_bitcoin.exe
+	-rm -f test_novacoin.exe
 	-rm -f src/build.h
 
 FORCE: