mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-02 02:53:32 +02:00
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:769f99f590569d4984c87468fa30a54a50dbcec8
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

No commits in common. "fad3bab2d030681801a11b17d9ae4a5277bfe90c" and "769f99f590569d4984c87468fa30a54a50dbcec8" have entirely different histories.
fad3bab2d0 ... 769f99f590

2 changed files with 2 additions and 7 deletions
Show Stats Expand all files Collapse all files

7
desktop_version/CMakeLists.txt
View File

@ -233,12 +233,7 @@ ADD_LIBRARY(tinyxml2-static STATIC ${XML2_SRC})
ADD_LIBRARY(physfs-static STATIC ${PFS_SRC} ${PFSP_SRC})
ADD_LIBRARY(lodepng-static STATIC ${PNG_SRC})
TARGET_COMPILE_DEFINITIONS(lodepng-static PRIVATE
-DLODEPNG_NO_COMPILE_ALLOCATORS
-DLODEPNG_NO_COMPILE_DISK
-DLODEPNG_NO_COMPILE_ENCODER
-DLODEPNG_NO_COMPILE_ZLIB
)
TARGET_COMPILE_DEFINITIONS(lodepng-static PRIVATE -DLODEPNG_NO_COMPILE_ALLOCATORS)
# Static Dependencies
TARGET_LINK_LIBRARIES(VVVVVV physfs-static tinyxml2-static lodepng-static)

2
desktop_version/src/Graphics.cpp
View File

@ -1932,7 +1932,7 @@ void Graphics::drawbackground( int t )
break;
case 2:
{
int bcol = 0, bcol2 = 0;
int bcol, bcol2;
//Lab
switch(rcol)