mirror of
https://github.com/phoboslab/wipeout-rewrite
synced 2024-12-26 09:59:04 +01:00
Include 3rd-party libs as system headers
Now, the compiler will only report errors in our code and not in any of these headers.
This commit is contained in:
parent
53d260d632
commit
2b3fcaaf0b
6 changed files with 13 additions and 18 deletions
|
@ -27,8 +27,7 @@ if(RENDERER IN_LIST gl_renderers)
|
||||||
set(using_gl true)
|
set(using_gl true)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Supported on Linux, FreeBSD, NetBSD?
|
cmake_dependent_option(USE_GLVND "Link against modern GLVND ABIs" OFF "using_gl;LINUX" ON)
|
||||||
cmake_dependent_option(USE_GLVND "Link against modern GLVND ABIs" ON "using_gl;UNIX;NOT APPLE;NOT EMSCRIPTEN" OFF)
|
|
||||||
cmake_dependent_option(MINIMAL_BUNDLE "Do not include music/movies for web builds" OFF "EMSCRIPTEN" OFF)
|
cmake_dependent_option(MINIMAL_BUNDLE "Do not include music/movies for web builds" OFF "EMSCRIPTEN" OFF)
|
||||||
|
|
||||||
find_package(OpenGL)
|
find_package(OpenGL)
|
||||||
|
@ -95,18 +94,14 @@ set(common_src
|
||||||
packaging/windows/wipeout.rc
|
packaging/windows/wipeout.rc
|
||||||
)
|
)
|
||||||
|
|
||||||
set(compile_opts
|
|
||||||
$<$<CXX_COMPILER_ID:MSVC>:/W4>
|
|
||||||
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wstrict-prototypes>
|
|
||||||
)
|
|
||||||
set_source_files_properties("${common_src}"
|
|
||||||
PROPERTIES COMPILE_FLAGS "${compile_opts}"
|
|
||||||
)
|
|
||||||
|
|
||||||
add_executable(wipeout WIN32 ${common_src})
|
add_executable(wipeout WIN32 ${common_src})
|
||||||
set_property(TARGET wipeout PROPERTY C_STANDARD 11)
|
set_property(TARGET wipeout PROPERTY C_STANDARD 11)
|
||||||
target_include_directories(wipeout PRIVATE src)
|
target_include_directories(wipeout PRIVATE src)
|
||||||
target_compile_options(wipeout PRIVATE ${compile_opts})
|
target_include_directories(wipeout SYSTEM PRIVATE src/libs)
|
||||||
|
target_compile_options(wipeout PRIVATE
|
||||||
|
$<$<CXX_COMPILER_ID:MSVC>:/W4>
|
||||||
|
$<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra>
|
||||||
|
)
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
target_compile_definitions(wipeout PRIVATE
|
target_compile_definitions(wipeout PRIVATE
|
||||||
|
|
|
@ -14,9 +14,9 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SOKOL_IMPL
|
#define SOKOL_IMPL
|
||||||
#include "libs/sokol_audio.h"
|
#include <sokol_audio.h>
|
||||||
#include "libs/sokol_time.h"
|
#include <sokol_time.h>
|
||||||
#include "libs/sokol_app.h"
|
#include <sokol_app.h>
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
// FIXME: we should figure out the actual path where the executabe resides,
|
// FIXME: we should figure out the actual path where the executabe resides,
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#include "libs/stb_image_write.h"
|
#include <stb_image_write.h>
|
||||||
|
|
||||||
#include "system.h"
|
#include "system.h"
|
||||||
#include "render.h"
|
#include "render.h"
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
|
|
||||||
#define STB_IMAGE_WRITE_IMPLEMENTATION
|
#define STB_IMAGE_WRITE_IMPLEMENTATION
|
||||||
#include "../libs/stb_image_write.h"
|
#include <stb_image_write.h>
|
||||||
|
|
||||||
|
|
||||||
#define TIM_TYPE_PALETTED_4_BPP 0x08
|
#define TIM_TYPE_PALETTED_4_BPP 0x08
|
||||||
|
|
|
@ -19,7 +19,7 @@ void *realloc_dummmy(void *p, size_t sz) {
|
||||||
#define PLM_MALLOC mem_bump
|
#define PLM_MALLOC mem_bump
|
||||||
#define PLM_FREE free_dummmy
|
#define PLM_FREE free_dummmy
|
||||||
#define PLM_REALLOC realloc_dummmy
|
#define PLM_REALLOC realloc_dummmy
|
||||||
#include "../libs/pl_mpeg.h"
|
#include <pl_mpeg.h>
|
||||||
|
|
||||||
#define INTRO_AUDIO_BUFFER_LEN (64 * 1024)
|
#define INTRO_AUDIO_BUFFER_LEN (64 * 1024)
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
|
|
||||||
#define QOA_IMPLEMENTATION
|
#define QOA_IMPLEMENTATION
|
||||||
#define QOA_NO_STDIO
|
#define QOA_NO_STDIO
|
||||||
#include "../libs/qoa.h"
|
#include <qoa.h>
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int16_t *samples;
|
int16_t *samples;
|
||||||
|
|
Loading…
Reference in a new issue