Merge pull request #9 from chcg/travis_x64

x64 build on travis

.travis.yml

@@ -1,15 +1,38 @@
-language: c++
+language: cpp
 
 compiler: gcc
 
-sudo: false
+dist: xenial
+sudo: required
 
-addons:
-  apt:
-    packages:
-      - binutils-mingw-w64-i686
-      - gcc-mingw-w64-i686
-      - g++-mingw-w64-i686
+matrix:
+  include:
+  - os:  linux
+    env: BITS=32
+    addons:
+      apt:
+        packages:
+          - binutils-mingw-w64-i686
+          - gcc-mingw-w64-i686
+          - g++-mingw-w64-i686
+  - os:  linux
+    env: BITS=64
+    addons:
+      apt:
+        packages:
+          - binutils-mingw-w64-x86-64
+          - gcc-mingw-w64-x86-64
+          - g++-mingw-w64-x86-64
 
 script:
-  - make
+  - make BITS=$BITS
+
+#deploy:
+#  provider:     releases
+#  file:         IndentByFold-*.zip
+#  file_glob:    true
+#  skip_cleanup: true
+#  api_key:
+#    secure: //TODO
+#  on:
+#    tags: true

Makefile

@@ -7,7 +7,12 @@
 .SUFFIXES: .dll .o .c .cpp .rc .h
 
 # For x64 build, ARCH=x86_64-w64-mingw32
+ifeq ($(BITS),64)
+ARCH = x86_64-w64-mingw32
+else
 ARCH = i686-w64-mingw32
+endif
+
 CC = $(ARCH)-gcc
 CXX = $(ARCH)-g++
 AR = $(ARCH)-ar