ich777/cdogs-sdl
1
0
Fork 0
mirror of https://github.com/cxong/cdogs-sdl.git synced 2025-07-22 15:10:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove mingw

Browse Source
This commit is contained in:
Cong
2020-01-03 20:31:33 +11:00
parent cd4111f2bd
commit b7ec8e482f
11 changed files with 56 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -66,10 +66,6 @@ Win32/
.vs/
VSInheritEnvironments.txt
# MinGW
stdout.txt
stderr.txt
# XCode
XCBuildData/
CMakeScripts/

2
CMakeLists.txt
View File

@@ -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

49
appveyor.yml
View File

@@ -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

49
appveyor.yml.cmake
View File

@@ -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

2
make.bat
View File

@@ -1,2 +0,0 @@
cmake -G "MinGW Makefiles" -D CMAKE_C_COMPILER=mingw32-gcc.exe -D CMAKE_MAKE_PROGRAM=mingw32-make.exe . && mingw32-make
pause

6
make.sh
View File

@@ -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

36
make_emscripten.ps1
View File

@@ -1,36 +0,0 @@
Remove-Item .\emscripten -Force -Recurse
New-Item -ItemType Directory emscripten
cmake -G "MinGW Makefiles" -D CMAKE_C_COMPILER=mingw32-gcc.exe -D CMAKE_MAKE_PROGRAM=mingw32-make.exe -D CMAKE_BUILD_TYPE=Debug .
emcc -D "PB_FIELD_16BIT=1" `
-Isrc/ `
-Isrc/cdogs/ `
-Isrc/cdogs/proto/nanopb/ `
-Isrc/cdogs/enet/include/ `
-Isrc/cdogs/include/ `
-Isrc/tests/ `
@(Get-ChildItem -Path src/*.c) `
@(Get-ChildItem -Path .\src\cdogs\*.c -Recurse -File) `
@(Get-ChildItem -Path src/json/*.c) `
-O0 -g4 `
-s ASSERTIONS=1 `
-s ALLOW_MEMORY_GROWTH=1 `
-s USE_SDL=2 `
-s USE_SDL_IMAGE=2 `
-s USE_SDL_MIXER=2 `
-s USE_OGG=1 `
-s USE_VORBIS=1 `
--preload-file data `
--preload-file doc `
--preload-file dogfights `
--preload-file graphics `
--preload-file missions `
--preload-file music `
--preload-file sounds `
-o emscripten/index.html `
-s @'
SDL2_IMAGE_FORMATS="[""png""]"
'@
Copy-Item .\build\windows\cdogs-icon.ico emscripten/favicon.ico

5
make_package.bat
View File

@@ -1,5 +0,0 @@
cmake -G "MinGW Makefiles" -D CMAKE_C_COMPILER=mingw32-gcc.exe -D CMAKE_MAKE_PROGRAM=mingw32-make.exe .
build\windows\get-sdl2-dlls.bat dll
mingw32-make
mingw32-make package
pause

4
src/cdogs.c
View File

@@ -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>

4
src/cdogsed/cdogsed.c
View File

@@ -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>

5
src/credits.h
View File

@@ -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>