Skip to content
Snippets Groups Projects
Commit 7d28b632 authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'master' into next

parents ab0445ae 2bd11120
No related branches found
No related tags found
2 merge requests!252OpenGL: Public flatsprite: The Fixening,!203Fixes for Each Time and P_IsObjectOnGroundIn
......@@ -47,7 +47,7 @@ before_build:
- upx -V
- ccache -V
- ccache -s
- set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC63=1 CCACHE=1
- set SRB2_MFLAGS=-C src MINGW=1 WARNINGMODE=1 GCC63=1 CCACHE=1 NOOBJDUMP=1
build_script:
- cmd: mingw32-make.exe %SRB2_MFLAGS% %CONFIGURATION%=1 clean
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment