mirror of
https://github.com/tildearrow/furnace.git
synced 2024-11-26 22:43:01 +00:00
Merge pull request #434 from OPNA2608/cmake/standard_or_bust
Forbid C++ standard extensions
This commit is contained in:
commit
a27d68ad1d
5 changed files with 10 additions and 6 deletions
|
@ -11,6 +11,7 @@ if (APPLE)
|
|||
endif()
|
||||
|
||||
set(CMAKE_CXX_STANDARD 14)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
set(CMAKE_PROJECT_VERSION_MAJOR 0)
|
||||
set(CMAKE_PROJECT_VERSION_MINOR 6)
|
||||
|
|
2
extern/SAASound/src/SAASound.h
vendored
2
extern/SAASound/src/SAASound.h
vendored
|
@ -53,7 +53,7 @@ typedef unsigned long SAAPARAM;
|
|||
#endif
|
||||
|
||||
#ifdef _WIN32
|
||||
#define SAAAPI _stdcall
|
||||
#define SAAAPI __stdcall
|
||||
#else
|
||||
#define SAAAPI
|
||||
#endif
|
||||
|
|
2
extern/SAASound/src/types.h
vendored
2
extern/SAASound/src/types.h
vendored
|
@ -30,7 +30,7 @@ typedef struct
|
|||
} ENVDATA;
|
||||
|
||||
#ifdef WIN32
|
||||
extern "C" void _stdcall OutputDebugStringA (char*);
|
||||
extern "C" void __stdcall OutputDebugStringA (char*);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
5
extern/igfd/ImGuiFileDialog.cpp
vendored
5
extern/igfd/ImGuiFileDialog.cpp
vendored
|
@ -44,10 +44,7 @@ SOFTWARE.
|
|||
#if defined (__EMSCRIPTEN__) // EMSCRIPTEN
|
||||
#include <emscripten.h>
|
||||
#endif // EMSCRIPTEN
|
||||
#if defined(__WIN32__) || defined(_WIN32)
|
||||
#ifndef WIN32
|
||||
#define WIN32
|
||||
#endif // WIN32
|
||||
#ifdef WIN32
|
||||
#define stat _stat
|
||||
#define stricmp _stricmp
|
||||
#include <cctype>
|
||||
|
|
6
extern/igfd/ImGuiFileDialog.h
vendored
6
extern/igfd/ImGuiFileDialog.h
vendored
|
@ -581,6 +581,12 @@ ImGuiFontStudio is using also ImGuiFileDialog.
|
|||
#ifndef IMGUIFILEDIALOG_H
|
||||
#define IMGUIFILEDIALOG_H
|
||||
|
||||
#if defined(__WIN32__) || defined(_WIN32)
|
||||
#ifndef WIN32
|
||||
#define WIN32
|
||||
#endif // WIN32
|
||||
#endif // defined(__WIN32__) || defined(_WIN32)
|
||||
|
||||
#define IMGUIFILEDIALOG_VERSION "v0.6.4"
|
||||
|
||||
#ifndef CUSTOM_IMGUIFILEDIALOG_CONFIG
|
||||
|
|
Loading…
Reference in a new issue