etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-23 13:05:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #434 from OPNA2608/cmake/standard_or_bust

Browse source 
Forbid C++ standard extensions
This commit is contained in:
tildearrow 2022-05-07 18:34:18 -05:00 committed by GitHub
commit a27d68ad1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -11,6 +11,7 @@ if (APPLE)
endif() endif()
set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_PROJECT_VERSION_MAJOR 0) set(CMAKE_PROJECT_VERSION_MAJOR 0)
set(CMAKE_PROJECT_VERSION_MINOR 6) set(CMAKE_PROJECT_VERSION_MINOR 6)

2
extern/SAASound/src/SAASound.h vendored
View file

@ -53,7 +53,7 @@ typedef unsigned long SAAPARAM;
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#define SAAAPI _stdcall #define SAAAPI __stdcall
#else #else
#define SAAAPI #define SAAAPI
#endif #endif

2
extern/SAASound/src/types.h vendored
View file

@ -30,7 +30,7 @@ typedef struct
} ENVDATA; } ENVDATA;
#ifdef WIN32 #ifdef WIN32
extern "C" void _stdcall OutputDebugStringA (char*); extern "C" void __stdcall OutputDebugStringA (char*);
#endif #endif
#endif #endif

5
extern/igfd/ImGuiFileDialog.cpp vendored
View file

@ -44,10 +44,7 @@ SOFTWARE.
#if defined (__EMSCRIPTEN__) // EMSCRIPTEN #if defined (__EMSCRIPTEN__) // EMSCRIPTEN
#include <emscripten.h> #include <emscripten.h>
#endif // EMSCRIPTEN #endif // EMSCRIPTEN
#if defined(__WIN32__) || defined(_WIN32) #ifdef WIN32
#ifndef WIN32
#define WIN32
#endif // WIN32
#define stat _stat #define stat _stat
#define stricmp _stricmp #define stricmp _stricmp
#include <cctype> #include <cctype>

6
extern/igfd/ImGuiFileDialog.h vendored
View file

@ -581,6 +581,12 @@ ImGuiFontStudio is using also ImGuiFileDialog.
#ifndef IMGUIFILEDIALOG_H #ifndef IMGUIFILEDIALOG_H
#define 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" #define IMGUIFILEDIALOG_VERSION "v0.6.4"
#ifndef CUSTOM_IMGUIFILEDIALOG_CONFIG #ifndef CUSTOM_IMGUIFILEDIALOG_CONFIG