Merge pull request #330 from mrikola/multiple-appveyor-jobs

Separate CI jobs for 32 and 64 bits

Author: Interrupt

Diff for: .travis.yml

@@ -4,17 +4,34 @@ notifications:
   email: false
 
 env:
-  - PACKAGE_NAME="shockolate-$TRAVIS_OS_NAME.tgz"
+  - PACKAGE_NAME="shockolate-$TRAVIS_OS_NAME-${BITS}bit.tgz"
 
 matrix:
   include:
+    - os: linux
+      dist: bionic
+      sudo: required
+      env:
+        - SDL2_LIB=BUNDLED
+        - SDL2_MIXER_LIB=BUNDLED
+        - FLUIDSYNTH_LIB=BUNDLED
+        - BITS=64
+      addons:
+        apt:
+          packages:
+            - cmake-data cmake libglu1-mesa-dev libgl1-mesa-dev # libfluidsynth-dev libsdl2-dev libsdl2-mixer-dev
+      compiler: gcc
     - os: linux
       dist: trusty
       sudo: required
       env:
         - SDL2_LIB=BUNDLED
         - SDL2_MIXER_LIB=BUNDLED
         - FLUIDSYNTH_LIB=BUNDLED
+        - CMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu
+        - BITS=32
+      before_script:
+        - cp osx-linux/CMakeLists.32bit.txt ./CMakeLists.txt
       addons:
         apt:
           packages:
@@ -26,26 +43,28 @@ matrix:
         - SDL2_LIB=BUNDLED
         - SDL2_MIXER_LIB=BUNDLED
         - FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
+        - BITS=64
     - os: osx
       compiler: gcc
       env:
         - SDL2_LIB=BUNDLED
         - SDL2_MIXER_LIB=BUNDLED
         - FLUIDSYNTH_LIB=OFF # Bundled lib failed to compile
+        - BITS=64
 
 script:
-  - sudo TRAVIS=$TRAVIS ./osx-linux/install_32bit_sdl.sh
-  - cmake -DCMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB} .
+  - chmod a+rx ./osx-linux/*.sh
+  - sudo TRAVIS=$TRAVIS ./osx-linux/install_${BITS}bit_sdl.sh
+  - cmake -DENABLE_SDL2=${SDL2_LIB} -DENABLE_SOUND=${SDL2_MIXER_LIB} -DENABLE_FLUIDSYNTH=${FLUIDSYNTH_LIB} .
   - make -j2 systemshock
 
 before_deploy:
   - mkdir -p shockolate
   - cp systemshock shockolate
-  - cp osx-linux/install_32bit_sdl.sh shockolate
+  - cp osx-linux/install_${BITS}bit_sdl.sh shockolate/install_sdl.sh
   - cp osx-linux/readme_osx_linux.md shockolate
   - cp osx-linux/run_$TRAVIS_OS_NAME.sh shockolate/run.sh
   - cp -r shaders shockolate/
-  - cp -r lib shockolate/
   - cp -r res shockolate/
   - cp readme/readme-$TRAVIS_OS_NAME.txt shockolate/readme.txt
   - tar zcfv $PACKAGE_NAME shockolate

Diff for: CMakeLists.txt

@@ -4,17 +4,19 @@ project(shockolate VERSION 0.7.8)
 
 include(FeatureSummary)
 
-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
-set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS ON)
+#set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS OFF)
+#set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS ON)
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF)
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 
 # Required for stdbool.h
 set(CMAKE_C_STANDARD 99)
 # For nullptr in C++
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32 -D__STDC_LIMIT_MACROS")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -D__STDC_LIMIT_MACROS")
 
 option(ENABLE_EXAMPLES "Enable example applications" OFF)
 add_feature_info(ENABLE_EXAMPLES ENABLE_EXAMPLES "Enable example application (can be broken!)")
@@ -42,7 +44,7 @@ if(ENABLE_DEBUG_BLIT)
 	add_definitions(-DDEBUGGING_BLIT)
 endif()
 
-add_compile_options(-fsigned-char -fno-strict-aliasing -Werror=implicit-function-declaration)
+add_compile_options(-fsigned-char -fno-strict-aliasing)
 
 # Find OpenGL
 if(ENABLE_OPENGL)

Diff for: appveyor.yml

@@ -10,26 +10,52 @@ image: Visual Studio 2015
 environment:
   APPVEYOR: TRUE
 
+platform:
+  - x64
+  - x86
+  
 # Avoid rebuilding external dependencies (ie. SDL and SDL_mixer)
 # Uncache build_ext if external deps change
 cache:
 #  - res/music.sf2
 #  - build_ext  
 
+# Set up environment variable values for 32 and 64 bit builds
+
+for:
+  -
+    matrix:
+      only:
+        - platform: x86
+    before_build:
+      - set BUILD_SCRIPT=build_win32.sh
+      - set ARTIFACT=systemshock-x86.zip
+      - set MINGW_PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin\
+  -
+    matrix:
+      only:
+        - platform: x64
+    before_build:
+      - set BUILD_SCRIPT=build_win64.sh
+      - set ARTIFACT=systemshock-x64.zip
+      - set MINGW_PATH=C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64\bin\
+   
 # Actual build script..
 # Step 1: Git has to reside in a path without spaces because the SDL build script is weird like that.
 #         So we create a symlink to the real Git, remove it from PATH and add our own.
 # Step 2: We need to use our own make.exe to build stuff, so we add that
 # Step 3: Do the actual building
+
 build_script:
   - mklink /D c:\git "C:\Program Files\Git"
   - set PATH=%PATH:C:\Program Files (x86)\Git\bin;=%
-  - set PATH=c:\git\usr\bin;%PATH%;C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin\
+  - set PATH=c:\git\usr\bin;%PATH%;%MINGW_PATH%
   - copy windows\make.exe \git\usr\bin
   - set CMAKE_MAKE_PROGRAM=c:\git\usr\bin\make.exe
-  - sh build_windows.sh
+  - sh %BUILD_SCRIPT%
   - build.bat
 
+   
 # For now, we don't have any automatic tests to run
 test: off
 
@@ -42,11 +68,13 @@ after_build:
   - copy build_ext\built_glew\lib\glew32.dll .
   - copy build_ext\fluidsynth-lite\src\libfluidsynth.dll .
   - copy readme\readme-windows.txt readme.txt
-  - 7z a systemshock-windows.zip systemshock.exe *.dll readme.txt shaders/ res/
+  - 7z a %ARTIFACT% systemshock.exe *.dll readme.txt shaders/ res/
 
 artifacts:
-  - path: systemshock-windows.zip
-    name: Shockolate
+  - path: systemshock-x86.zip
+    name: Shockolate (32bit)
+  - path: systemshock-x64.zip
+    name: Shockolate (64bit)
 
 version: '0.5.{build}'
 
@@ -58,7 +86,7 @@ deploy:
   - provider: GitHub
     release: $(appveyor_repo_tag_name)
     description: 'Latest release build of Shockolate'
-    artifact: systemshock-windows.zip
+    artifact: systemshock-x86.zip, systemshock-x64.zip
     auth_token:
       secure: P1kIk8rRxKAYHqDrOWf0Zf5spfR+N86E0lO8VBu99vHtECJgPLn/Z6tBmL9cxPah  
     on:

Diff for: build_deps.sh

@@ -24,7 +24,7 @@ function build_sdl {
 	tar xvf SDL2-${SDL_version}.tar.gz
 	pushd SDL2-${SDL_version}
 
-	./configure "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32" --prefix=${install_dir}/built_sdl
+	./configure --prefix=${install_dir}/built_sdl
 	make
 	make install
 
@@ -37,7 +37,7 @@ function build_sdl_mixer {
 	pushd SDL2_mixer-${SDL2_mixer_version}
 
 	export SDL2_CONFIG="${install_dir}/built_sdl/bin/sdl2-config"
-	./configure "CFLAGS=-m32" "CXXFLAGS=-m32" "LDFLAGS=-m32" --prefix=${install_dir}/built_sdl_mixer
+	./configure --prefix=${install_dir}/built_sdl_mixer
 	make
 	make install
 
@@ -51,8 +51,8 @@ function build_fluidsynth {
 	# if building fluidsynth fails, move on without it
 	set +e
 
-	export CFLAGS="-m32"
-	export CXXFLAGS="-m32"
+	#export CFLAGS="-m32"
+	#export CXXFLAGS="-m32"
 
 	cmake .
 	cmake --build .

Diff for: build_windows.sh renamed to build_win32.sh

@@ -0,0 +1,117 @@
+#!/bin/bash
+set -e
+
+SDL_version=2.0.10
+SDL2_mixer_version=2.0.4
+GLEW_version=2.1.0
+CMAKE_version=3.11.3
+CMAKE_architecture=win64-x64
+#CMAKE_architecture=win32-x86
+CMAKE_target=Unix\ Makefiles
+
+# Removing the mwindows linker option lets us get console output
+function remove_mwindows {
+	sed -i -e "s/ \-mwindows//g" Makefile
+}
+
+function build_sdl {
+	curl -O https://www.libsdl.org/release/SDL2-devel-${SDL_version}-mingw.tar.gz
+	tar xvf SDL2-devel-${SDL_version}-mingw.tar.gz
+	cp -r SDL2-${SDL_version}/x86_64-w64-mingw32/ built_sdl/
+}
+
+function build_sdl_mixer {
+	curl -O https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-${SDL2_mixer_version}-mingw.tar.gz
+	tar xf SDL2_mixer-devel-${SDL2_mixer_version}-mingw.tar.gz --exclude=Xcode
+	cp -r SDL2_mixer-${SDL2_mixer_version}/x86_64-w64-mingw32/ built_sdl_mixer/
+}
+
+function build_glew {
+	curl -O https://netcologne.dl.sourceforge.net/project/glew/glew/${GLEW_version}/glew-${GLEW_version}.tgz
+	tar xvf glew-${GLEW_version}.tgz
+	mv glew-${GLEW_version}/ built_glew/
+	pushd built_glew
+	mingw32-make glew.lib
+	popd
+}
+
+function build_fluidsynth {
+	git clone https://github.com/Doom64/fluidsynth-lite.git
+	pushd fluidsynth-lite
+	sed -i 's/DLL"\ off/DLL"\ on/' CMakeLists.txt
+	# if building fluidsynth fails, move on without it
+	set +e
+	cmake -G "${CMAKE_target}" .
+	cmake --build .
+
+	# download a soundfont that's close to the Windows default everyone knows
+	curl -o music.sf2 http://rancid.kapsi.fi/windows.sf2
+	set -e
+	popd
+}
+
+function get_cmake {
+	curl -O https://cmake.org/files/v3.11/cmake-${CMAKE_version}-${CMAKE_architecture}.zip
+	unzip cmake-${CMAKE_version}-${CMAKE_architecture}.zip
+	pushd cmake-${CMAKE_version}-${CMAKE_architecture}/bin
+	CMAKE_ROOT=`pwd -W`/
+	popd
+}
+
+## Actual building starts here
+
+if [ -d ./build_ext/ ]; then
+	echo A directory named build_ext already exists.
+	echo Please remove it if you want to recompile.
+	exit
+fi
+
+rm -rf CMakeFiles/
+rm -rf CMakeCache.txt
+
+cp windows/make.exe /usr/bin/
+
+if [ ! -d ./res/ ]; then
+mkdir ./res/
+fi
+
+mkdir ./build_ext/
+cd ./build_ext/
+install_dir=`pwd -W`
+
+if ! [ -x "$(command -v cmake)" ]; then
+	echo "Getting CMake"
+	get_cmake
+fi
+
+
+build_sdl
+build_sdl_mixer
+build_glew
+build_fluidsynth
+
+
+# Back to the root directory, copy required DLL files for the executable
+cd ..
+cp build_ext/built_sdl/bin/SDL*.dll .
+cp build_ext/built_sdl_mixer/bin/SDL*.dll .
+cp build_ext/built_glew/lib/*.dll .
+cp build_ext/fluidsynth-lite/src/*.dll .
+
+# move the soundfont to the correct place if we successfully built fluidsynth
+mv build_ext/fluidsynth-lite/*.sf2 ./res
+
+# Set up build.bat
+if [[ -z "${APPVEYOR}" ]]; then
+	echo "Normal build"
+	echo "@echo off
+	set PATH=%PATH%;${CMAKE_ROOT}
+	cmake -G \"${CMAKE_target}\" .
+	mingw32-make systemshock" >build.bat
+else
+	echo "Appveyor"
+	echo "cmake -G \"${CMAKE_target}\" . 
+	make systemshock" >build.bat
+fi
+
+echo "Our work here is done. Run BUILD.BAT in a Windows shell to build the actual source."