Changes to enable cross-compilation on linux of both windows and linux binaries

src/makefile.linux-mingw

@@ -2,37 +2,47 @@
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-DEPSDIR:=/usr/i686-w64-mingw32
+DEPSDIR:=/home/ubuntu/deps/windows
+BINPATH=/home/ubuntu/mxe/usr/bin
+PREFIX=i686-w64-mingw32.static
+BASEDIR=/home/ubuntu/mxe/usr/$(PREFIX)
 
-CC := i686-w64-mingw32-gcc
-CXX := i686-w64-mingw32-g++
+CC=$(BINPATH)/$(PREFIX)-gcc
+CXX=$(BINPATH)/$(PREFIX)-g++
+CPP=$(BINPATH)/$(PREFIX)-cpp
+RANLIB=$(BINPATH)/$(PREFIX)-ranlib
 
 USE_UPNP:=0
 USE_IPV6:=1
 
 INCLUDEPATHS= \
  -I"$(CURDIR)" \
- -I"$(CURDIR)"/obj \
- -I"$(DEPSDIR)/include" \
- -I"$(DEPSDIR)"
+ -I"$(CURDIR)/obj" \
+ -I"$(DEPSDIR)" \
+ -I"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
+ -I"$(DEPSDIR)/openssl-1.0.1h/include" \
+ -I"$(BASEDIR)/include"
 
 LIBPATHS= \
- -L"$(DEPSDIR)/lib"
+ -L"$(DEPSDIR)/miniupnpc" \
+ -L"$(DEPSDIR)/db-4.8.30.NC/build_unix" \
+ -L"$(DEPSDIR)/openssl-1.0.1h" \
+ -L"$(BASEDIR)/lib"
 
 LIBS= \
   $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a \
- -l boost_system-mt-s \
- -l boost_filesystem-mt-s \
- -l boost_program_options-mt-s \
- -l boost_thread_win32-mt-s \
- -l boost_chrono-mt-s \
+ -l boost_system-mt \
+ -l boost_filesystem-mt \
+ -l boost_program_options-mt \
+ -l boost_thread_win32-mt \
+ -l boost_chrono-mt \
  -l db_cxx \
  -l ssl \
  -l crypto
 
 DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
 DEBUGFLAGS=-g
-xCXXFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(CXXFLAGS)
+xCXXFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-strict-aliasing $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) $(CXXFLAGS)
 # enable: ASLR, DEP and large address aware
 xLDFLAGS=-Wl,--dynamicbase -Wl,--nxcompat -Wl,--large-address-aware -static-libgcc -static-libstdc++ $(LDFLAGS)
 
@@ -101,7 +111,7 @@ all: casinocoind.exe
 DEFS += -I"$(CURDIR)/leveldb/include"
 DEFS += -I"$(CURDIR)/leveldb/helpers"
 leveldb/libleveldb.a:
-	@echo "Building LevelDB ..." && cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && i686-w64-mingw32-ranlib libleveldb.a && i686-w64-mingw32-ranlib libmemenv.a && cd ..
+	@echo "Building LevelDB ..." && cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && $(RANLIB) libleveldb.a && $(RANLIB) libmemenv.a && cd ..
 
 obj/build.h: FORCE
 	/bin/sh ../share/genbuild.sh obj/build.h

src/makefile.unix

@@ -5,18 +5,34 @@
 # :=0 --> UPnP support turned off by default at runtime
 # :=1 --> UPnP support turned on by default at runtime
 # :=- --> No UPnP support - miniupnp not required
-USE_UPNP:=0
+USE_UPNP:=-
 
 # :=1 --> Enable IPv6 support
 # :=0 --> Disable IPv6 support
 USE_IPV6:=1
 
+# :=1 --> Enable QR Code support
+# :=0 --> Disable QR Code support
+USE_QRCODE=1
+
+# define libraries
+BOOST_LIB_PATH=/home/ubuntu/deps/linux/boost_1_55_0/stage/lib
+BDB_LIB_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix
+OPENSSL_LIB_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h
+MINIUPNPC_LIB_PATH=/home/ubuntu/deps/linux/miniupnpc
+
+# define includes
+BOOST_INCLUDE_PATH=/home/ubuntu/deps/linux/boost_1_55_0
+BDB_INCLUDE_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix
+OPENSSL_INCLUDE_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h
+MINIUPNPC_INCLUDE_PATH=/home/ubuntu/deps/linux
+
 LINK:=$(CXX)
 
 DEFS=-DBOOST_SPIRIT_THREADSAFE -D_FILE_OFFSET_BITS=64
 
-DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
-LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))
+DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH) $(MINIUPNPC_INCLUDE_PATH))
+LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH) $(MINIUPNPC_LIB_PATH))
 
 TESTDEFS = -DTEST_DATA_DIR=$(abspath test/data)
 

src/obj/placeholder.txt

@@ -1 +0,0 @@
-To avoid compile error.

src/util.h

@@ -9,9 +9,9 @@
 
 #include <stdarg.h>
 
-#ifndef WIN32
 #include <sys/types.h>
 #include <sys/time.h>
+#ifndef WIN32
 #include <sys/resource.h>
 #endif
 #include <map>