Skip to content

Commit

Permalink
Remove mingw
Browse files Browse the repository at this point in the history
  • Loading branch information
@cxong
cxong committed Jan 3, 2020
1 parent cd4111f commit b7ec8e4
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 110 deletions.
4 changes: 0 additions & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@ Win32/
.vs/
VSInheritEnvironments.txt

# MinGW
stdout.txt
stderr.txt

# XCode
XCBuildData/
CMakeScripts/
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
set(CLANG 1)
endif()

if(MINGW)
if(WIN32)
set(CMAKE_RC_COMPILER_INIT windres)
enable_language(RC)
SET(CMAKE_RC_COMPILE_OBJECT
Expand Down
49 changes: 27 additions & 22 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,54 @@ branches:
except:
- gh-pages

clone_folder: c:\projects\cdogs-sdl
image:
- Visual Studio 2019
configuration:
- Release
- Debug
matrix:
fast_finish: true
environment:
CTEST_OUTPUT_ON_FAILURE: 1
SDL2_VERSION: 2.0.10
SDL2_IMAGE_VERSION: 2.0.5
SDL2_MIXER_VERSION: 2.0.4
MINGW_PATH: C:\MinGW
SDLDIR: C:\MinGW
SDLDIR: C:\projects\cdogs-sdl
VERSION: 0.7.3

platform:
- x86

install:
# CMake refuses to generate MinGW Makefiles if sh.exe is in the Path
- ps: Get-Command sh.exe -All | Remove-Item
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-%SDL2_VERSION%-mingw.tar.gz appveyor DownloadFile http://libsdl.org/release/SDL2-devel-%SDL2_VERSION%-mingw.tar.gz
- 7z x SDL2-devel-%SDL2_VERSION%-mingw.tar.gz -so | 7z x -si -ttar -oC:\
- echo y | xcopy C:\SDL2-%SDL2_VERSION%\i686-w64-mingw32\* %MINGW_PATH%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz appveyor DownloadFile https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz
- 7z x SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz -so | 7z x -si -ttar -oC:\
- echo y | xcopy C:\SDL2_mixer-%SDL2_MIXER_VERSION%\i686-w64-mingw32\* %MINGW_PATH%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz
- 7z x SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz -so | 7z x -si -ttar -oC:\
- echo y | xcopy C:\SDL2_image-%SDL2_IMAGE_VERSION%\i686-w64-mingw32\* %MINGW_PATH%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-%SDL2_VERSION%-VC.tar.gz appveyor DownloadFile http://libsdl.org/release/SDL2-devel-%SDL2_VERSION%-VC.zip
- 7z x SDL2-devel-%SDL2_VERSION%-VC.zip -oC:\
- echo y | xcopy C:\SDL2-%SDL2_VERSION%\* %SDLDIR%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip appveyor DownloadFile https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip
- 7z x SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip -oC:\
- echo y | xcopy C:\SDL2_mixer-%SDL2_MIXER_VERSION%\* %SDLDIR%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip
- 7z x SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip -oC:\
- echo y | xcopy C:\SDL2_image-%SDL2_IMAGE_VERSION%\* %SDLDIR%\ /S

before_build:
- .\build\windows\get-sdl2-dlls.bat dll "appveyor DownloadFile"
- set Path=%MINGW_PATH%\bin;%Path%
- if "%APPVEYOR_REPO_TAG%"=="true" (set CMAKE_BUILD_TYPE=Release) else (set CMAKE_BUILD_TYPE=Debug)
- cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% -D CMAKE_C_COMPILER=mingw32-gcc.exe -D CMAKE_MAKE_PROGRAM=mingw32-make.exe .
- cmake -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% -DCMAKE_PREFIX_PATH="%SDLDIR%" .

build_script:
- mingw32-make
build:
project: c:\projects\cdogs-sdl\cdogs-sdl.sln
verbosity: minimal
parallel: true

after_build:
- mingw32-make test
- mingw32-make package
- make package
- dir

cache:
- SDL2-devel-%SDL2_VERSION%-mingw.tar.gz
- SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz
- SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz
- SDL2-devel-%SDL2_VERSION%-VC.zip
- SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip
- SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip
- dir\SDL2-%SDL2_VERSION%-win32-x86.zip
- dir\SDL2_image-%SDL2_IMAGE_VERSION%-win32-x86.zip
- dir\SDL2_mixer-%SDL2_MIXER_VERSION%-win32-x86.zip
Expand Down
49 changes: 27 additions & 22 deletions appveyor.yml.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,54 @@ branches:
except:
- gh-pages

clone_folder: c:\projects\cdogs-sdl
image:
- Visual Studio 2019
configuration:
- Release
- Debug
matrix:
fast_finish: true
environment:
CTEST_OUTPUT_ON_FAILURE: 1
SDL2_VERSION: 2.0.10
SDL2_IMAGE_VERSION: 2.0.5
SDL2_MIXER_VERSION: 2.0.4
MINGW_PATH: C:\MinGW
SDLDIR: C:\MinGW
SDLDIR: C:\projects\cdogs-sdl
VERSION: @VERSION@

platform:
- x86

install:
# CMake refuses to generate MinGW Makefiles if sh.exe is in the Path
- ps: Get-Command sh.exe -All | Remove-Item
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-%SDL2_VERSION%-mingw.tar.gz appveyor DownloadFile http://libsdl.org/release/SDL2-devel-%SDL2_VERSION%-mingw.tar.gz
- 7z x SDL2-devel-%SDL2_VERSION%-mingw.tar.gz -so | 7z x -si -ttar -oC:\
- echo y | xcopy C:\SDL2-%SDL2_VERSION%\i686-w64-mingw32\* %MINGW_PATH%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz appveyor DownloadFile https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz
- 7z x SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz -so | 7z x -si -ttar -oC:\
- echo y | xcopy C:\SDL2_mixer-%SDL2_MIXER_VERSION%\i686-w64-mingw32\* %MINGW_PATH%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz
- 7z x SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz -so | 7z x -si -ttar -oC:\
- echo y | xcopy C:\SDL2_image-%SDL2_IMAGE_VERSION%\i686-w64-mingw32\* %MINGW_PATH%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2-devel-%SDL2_VERSION%-VC.tar.gz appveyor DownloadFile http://libsdl.org/release/SDL2-devel-%SDL2_VERSION%-VC.zip
- 7z x SDL2-devel-%SDL2_VERSION%-VC.zip -oC:\
- echo y | xcopy C:\SDL2-%SDL2_VERSION%\* %SDLDIR%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip appveyor DownloadFile https://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip
- 7z x SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip -oC:\
- echo y | xcopy C:\SDL2_mixer-%SDL2_MIXER_VERSION%\* %SDLDIR%\ /S
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip appveyor DownloadFile https://www.libsdl.org/projects/SDL_image/release/SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip
- 7z x SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip -oC:\
- echo y | xcopy C:\SDL2_image-%SDL2_IMAGE_VERSION%\* %SDLDIR%\ /S

before_build:
- .\build\windows\get-sdl2-dlls.bat dll "appveyor DownloadFile"
- set Path=%MINGW_PATH%\bin;%Path%
- if "%APPVEYOR_REPO_TAG%"=="true" (set CMAKE_BUILD_TYPE=Release) else (set CMAKE_BUILD_TYPE=Debug)
- cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% -D CMAKE_C_COMPILER=mingw32-gcc.exe -D CMAKE_MAKE_PROGRAM=mingw32-make.exe .
- cmake -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% -DCMAKE_PREFIX_PATH="%SDLDIR%" .

build_script:
- mingw32-make
build:
project: c:\projects\cdogs-sdl\cdogs-sdl.sln
verbosity: minimal
parallel: true

after_build:
- mingw32-make test
- mingw32-make package
- make package
- dir

cache:
- SDL2-devel-%SDL2_VERSION%-mingw.tar.gz
- SDL2_image-devel-%SDL2_IMAGE_VERSION%-mingw.tar.gz
- SDL2_mixer-devel-%SDL2_MIXER_VERSION%-mingw.tar.gz
- SDL2-devel-%SDL2_VERSION%-VC.zip
- SDL2_image-devel-%SDL2_IMAGE_VERSION%-VC.zip
- SDL2_mixer-devel-%SDL2_MIXER_VERSION%-VC.zip
- dir\SDL2-%SDL2_VERSION%-win32-x86.zip
- dir\SDL2_image-%SDL2_IMAGE_VERSION%-win32-x86.zip
- dir\SDL2_mixer-%SDL2_MIXER_VERSION%-win32-x86.zip
Expand Down
2 changes: 0 additions & 2 deletions make.bat
View file

This file was deleted.

6 changes: 1 addition & 5 deletions make.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

# To create a debug build, run `cmake -D CMAKE_BUILD_TYPE=Debug .` instead

if [ "`uname -s | cut -c1-5`" = "MINGW" ] ; then
echo "Build for MinGW"
cmake -G"MinGW Makefiles" .
make
elif command -v ninja > /dev/null 2>&1; then
if command -v ninja > /dev/null 2>&1; then
echo "Build using Ninja"
cmake -GNinja .
ninja
Expand Down
36 changes: 0 additions & 36 deletions make_emscripten.ps1
View file

This file was deleted.

5 changes: 0 additions & 5 deletions make_package.bat
View file

This file was deleted.

4 changes: 0 additions & 4 deletions src/cdogs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@
#include <stdio.h>

#include <SDL.h>
#ifdef __MINGW32__
// HACK: MinGW complains about redefinition of main
#undef main
#endif

#include <cdogs/ammo.h>
#include <cdogs/campaigns.h>
Expand Down
4 changes: 0 additions & 4 deletions src/cdogsed/cdogsed.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@
#include <stdio.h>

#include <SDL.h>
#ifdef __MINGW32__
// HACK: MinGW complains about redefinition of main
#undef main
#endif

#include <cdogs/actors.h>
#include <cdogs/automap.h>
Expand Down
5 changes: 0 additions & 5 deletions src/credits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@
*/
#pragma once

#ifdef __MINGW32__
// MinGW time bug
// http://stackoverflow.com/questions/21015113/difftime-returns-incorrect-value-in-mingw
#define _USE_32BIT_TIME_T 1
#endif
#include <time.h>

#include <cdogs/c_array.h>
Expand Down

0 comments on commit b7ec8e4

Please sign in to comment.