mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: mpo:fad3bab2d030681801a11b17d9ae4a5277bfe90c
Branches Tags
mpo:master
mpo:2.4-updates
mpo:2.3-updates
mpo:2.4.1
mpo:2.4
mpo:2.3.6
mpo:2.3.5
mpo:2.3.4
mpo:2.3.3
mpo:2.3.2
mpo:2.3.1
mpo:2.3
mpo:2.2
...
compare: mpo:74740c5a21c05116b92deba8e462f815232fd3bc
Branches Tags
mpo:2.4-updates
mpo:master
mpo:2.3-updates
mpo:2.4.1
mpo:2.4
mpo:2.3.6
mpo:2.3.5
mpo:2.3.4
mpo:2.3.3
mpo:2.3.2
mpo:2.3.1
mpo:2.3
mpo:2.2

2 Commits
fad3bab2d0 ... 74740c5a21

Author SHA1 Message Date
Misa 74740c5a21 Remove LODEPNG_NO_COMPILE_ZLIB 
This fixes a segfault, because we would then pass compressed image data
to SDL_ConvertSurfaceFormat() in LoadImage(). I didn't test my previous
PR. Whoops.
 2021-01-14 06:31:30 -05:00
Misa 9c9433d21a Disable MSVC warnings about implicit conversion 
Implicit conversion warnings happen all over the codebase, but there's
no reason to warn on all of them, and adding casts everywhere is
annoying to read and patently unnecessary.

MSVC is the only compiler that has this warning (GCC even on -Wall
-Wextra doesn't warn about implicit conversions), so disable it for
MSVC.
 2021-01-14 06:30:22 -05:00
1 changed files with 5 additions and 1 deletions
Show Stats Expand all files Collapse all files

6
desktop_version/CMakeLists.txt
View File

@ -225,6 +225,11 @@ IF(SUPPORTS_IMPLICIT_FALLTHROUGH)
TARGET_COMPILE_OPTIONS(VVVVVV PRIVATE -Werror=implicit-fallthrough)
ENDIF()
IF(MSVC)
# Disable MSVC warnings about implicit conversion
TARGET_COMPILE_OPTIONS(VVVVVV PRIVATE /wd4244)
ENDIF()
SET_PROPERTY(TARGET VVVVVV PROPERTY CXX_STANDARD 98)
SET_PROPERTY(TARGET VVVVVV PROPERTY CXX_EXTENSIONS FALSE)
@ -237,7 +242,6 @@ TARGET_COMPILE_DEFINITIONS(lodepng-static PRIVATE
-DLODEPNG_NO_COMPILE_ALLOCATORS
-DLODEPNG_NO_COMPILE_DISK
-DLODEPNG_NO_COMPILE_ENCODER
-DLODEPNG_NO_COMPILE_ZLIB
)
# Static Dependencies