mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 17:49:43 +01:00
Code Issues Releases Wiki Activity

Fix compiler warnings on Android

Browse source
This commit is contained in:
leo60228 2023-09-21 17:49:01 -04:00 committed by Misa Elizabeth Kai
parent 246a91c45e
commit d6a43fad90
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop_version/CMakeLists.txt
View file

@ -274,6 +274,11 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(VVVVVV PRIVATE -Wno-c++11-long-long) target_compile_options(VVVVVV PRIVATE -Wno-c++11-long-long)
endif() endif()
# Disable warnings about flexible array members in C++ (from including FAudio)
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(VVVVVV PRIVATE -Wno-c99-extensions)
endif()
if(MSVC) if(MSVC)
# MSVC doesn't have /std:c99 or /std:c++98 switches! # MSVC doesn't have /std:c99 or /std:c++98 switches!

2
desktop_version/src/FileSystemUtils.cpp
View file

@ -76,6 +76,7 @@ static const PHYSFS_Allocator allocator = {
SDL_free SDL_free
}; };
#ifndef __ANDROID__
static bool mount_pre_datazip( static bool mount_pre_datazip(
char* out_path, char* out_path,
const char* real_dirname, const char* real_dirname,
@ -174,6 +175,7 @@ static bool mount_pre_datazip(
return dir_found; return dir_found;
} }
#endif
int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath, char* langDir, char* fontsDir) int FILESYSTEM_init(char *argvZero, char* baseDir, char *assetsPath, char* langDir, char* fontsDir)
{ {

7
desktop_version/src/Vlogging.c
View file

@ -24,8 +24,13 @@
#define Color_BOLD_RED COLOR("\x1b[1;31m") #define Color_BOLD_RED COLOR("\x1b[1;31m")
#define Color_BOLD_GRAY COLOR("\x1b[1;90m") #define Color_BOLD_GRAY COLOR("\x1b[1;90m")
static int output_enabled = 1; #ifdef __ANDROID__
const int color_supported = 0;
#else
static int color_supported = 0; static int color_supported = 0;
#endif
static int output_enabled = 1;
static int color_enabled = 1; static int color_enabled = 1;
static int debug_enabled = 0; static int debug_enabled = 0;
static int info_enabled = 1; static int info_enabled = 1;