nessa
/
dosgame1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial commit
findwindow build main / build-debug-dos (push) Failing after 4s Details
findwindow build main / build-release-dos (push) Failing after 3s Details
findwindow build main / build-debug-sdlwin64 (push) Successful in 16s Details
findwindow build main / build-release-sdlwin64 (push) Successful in 15s Details
findwindow build main / build-debug-sdl (push) Successful in 13s Details
findwindow build main / build-release-sdl (push) Successful in 12s Details

This commit is contained in:
Vanessa 2025-10-14 10:02:54 +02:00
parent 84eee5f3c1
commit 869925d13e
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitea/build-main.yaml → .gitea/workflows/build-main.yaml
View File

@ -4,9 +4,11 @@ on:
push: push:
branches: branches:
- main - main
- master
pull_request: pull_request:
branches: branches:
- main - main
- master
jobs: jobs:
build-debug-dos: build-debug-dos:
@ -40,7 +42,7 @@ jobs:
release release
build-debug-sdlwin64: build-debug-sdlwin64:
runs-on: ubuntu-mingw-cmake-latest runs-on: ubuntu-builder-latest
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -55,7 +57,7 @@ jobs:
debug debug
build-release-sdlwin64: build-release-sdlwin64:
runs-on: ubuntu-mingw-cmake-latest runs-on: ubuntu-builder-latest
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -68,10 +70,9 @@ jobs:
name: release-sdlwin64 name: release-sdlwin64
path: path:
release release
game.img
build-debug-sdl: build-debug-sdl:
runs-on: ubuntu-latest runs-on: ubuntu-builder-latest
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -86,7 +87,7 @@ jobs:
debug debug
build-release-sdl: build-release-sdl:
runs-on: ubuntu-latest runs-on: ubuntu-builder-latest
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
@ -99,4 +100,3 @@ jobs:
name: release-sdl name: release-sdl
path: path:
release release
game.img

31
Makefile
View File

@ -24,20 +24,22 @@ CC=i686-w64-mingw32-gcc
CXX=i686-w64-mingw32-g++ CXX=i686-w64-mingw32-g++
LD=i686-w64-mingw32-g++ LD=i686-w64-mingw32-g++
STRIP=i686-w64-mingw32-strip STRIP=i686-w64-mingw32-strip
WINDRES=windres WINDRES=i686-w64-mingw32-windres
SDL_INCLUDE=-I../SDL2-2.32.10/i686-w64-mingw32/include/SDL2 SDL_INCLUDE=-I/usr/i686-w64-mingw32/include/SDL2
SDL_LDFLAGS=-L../SDL2-2.32.10/i686-w64-mingw32/lib SDL_LDFLAGS=-L/usr/i686-w64-mingw32/lib
SDL_LIBS=-lmingw32 -lSDL2main -lSDL2.dll SDL_LIBS=-lmingw32 -lSDL2main -lSDL2.dll
CFLAGS=-g -DBUILD_SDL $(SDL_INCLUDE) -m32 CFLAGS=-g -DBUILD_SDL $(SDL_INCLUDE) -m32
CXXFLAGS=$(CFLAGS) CXXFLAGS=$(CFLAGS)
LDFLAGS=$(SDL_LDFLAGS) -mwindows LDFLAGS=$(SDL_LDFLAGS)
#LDFLAGS+=-mwindows
LDLIBS=$(SDL_LIBS) -lstdc++ LDLIBS=$(SDL_LIBS) -lstdc++
EXE=game.exe EXE=game.exe
EXTRA_FILES=../SDL2-2.32.10/i686-w64-mingw32/bin/SDL2.dll EXTRA_FILES=$(shell find /usr/i686-w64-mingw32/ -iname 'SDL2.dll' | head -n1)
EXTRA_FILES+=/usr/lib/gcc/i686-w64-mingw32/10-win32/libgcc_s_dw2-1.dll EXTRA_FILES+=$(shell find /usr/lib/gcc/i686-w64-mingw32/ -iname 'libgcc_s_dw2-1.dll' | grep win32 | head -n1)
EXTRA_FILES+=/usr/lib/gcc/i686-w64-mingw32/10-win32/libstdc++-6.dll EXTRA_FILES+=$(shell find /usr/lib/gcc/i686-w64-mingw32/ -iname 'libgcc_s_seh-1.dll' | grep win32 | head -n1)
EXTRA_FILES+=$(shell find /usr/lib/gcc/i686-w64-mingw32/ -iname 'libstdc++-6.dll' | grep win32 | head -n1)
SYSTEM=SDL SYSTEM=SDL
PLATFORM_OBJ=app.res PLATFORM_OBJ=app.res
else ifeq ($(TARGET),SDLWIN64) else ifeq ($(TARGET),SDLWIN64)
@ -46,21 +48,22 @@ CC=x86_64-w64-mingw32-gcc
CXX=x86_64-w64-mingw32-g++ CXX=x86_64-w64-mingw32-g++
LD=x86_64-w64-mingw32-g++ LD=x86_64-w64-mingw32-g++
STRIP=x86_64-w64-mingw32-strip STRIP=x86_64-w64-mingw32-strip
WINDRES=windres WINDRES=x86_64-w64-mingw32-windres
SDL_INCLUDE=-I../SDL2-2.32.10/x86_64-w64-mingw32/include/SDL2 SDL_INCLUDE=-I/usr/x86_64-w64-mingw32/include/SDL2
SDL_LDFLAGS=-L../SDL2-2.32.10/x86_64-w64-mingw32/lib SDL_LDFLAGS=-L/usr/x86_64-w64-mingw32/lib
SDL_LIBS=-lmingw32 -lSDL2main -lSDL2.dll SDL_LIBS=-lmingw32 -lSDL2main -lSDL2.dll
CFLAGS=-g -DBUILD_SDL $(SDL_INCLUDE) -m64 CFLAGS=-g -DBUILD_SDL $(SDL_INCLUDE) -m64
CXXFLAGS=$(CFLAGS) CXXFLAGS=$(CFLAGS)
#LDFLAGS=$(SDL_LDFLAGS) -mwindows
LDFLAGS=$(SDL_LDFLAGS) LDFLAGS=$(SDL_LDFLAGS)
#LDFLAGS+=-mwindows
LDLIBS=$(SDL_LIBS) -lstdc++ LDLIBS=$(SDL_LIBS) -lstdc++
EXE=game.exe EXE=game.exe
EXTRA_FILES=../SDL2-2.32.10/x86_64-w64-mingw32/bin/SDL2.dll EXTRA_FILES=$(shell find /usr/x86_64-w64-mingw32/ -iname 'SDL2.dll' | head -n1)
EXTRA_FILES+=/mingw64/bin/libgcc_s_seh-1.dll EXTRA_FILES+=$(shell find /usr/lib/gcc/x86_64-w64-mingw32/ -iname 'libgcc_s_dw2-1.dll' | grep win32 | head -n1)
EXTRA_FILES+=/mingw64/bin/libstdc++-6.dll EXTRA_FILES+=$(shell find /usr/lib/gcc/x86_64-w64-mingw32/ -iname 'libgcc_s_seh-1.dll' | grep win32 | head -n1)
EXTRA_FILES+=$(shell find /usr/lib/gcc/x86_64-w64-mingw32/ -iname 'libstdc++-6.dll' | grep win32 | head -n1)
SYSTEM=SDL SYSTEM=SDL
PLATFORM_OBJ=app.res PLATFORM_OBJ=app.res
else else