16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 01:59:19 +02:00

fix compiling on MacOS

This commit is contained in:
milek
2019-03-25 20:17:27 +00:00
parent 1fba251baf
commit 810ea151e2
3 changed files with 12 additions and 2 deletions

View File

@@ -9,6 +9,10 @@ set(CMAKE_CXX_STANDARD 14)
include_directories("." "Console" "McZapkie")
file(GLOB HEADERS "*.h" "Console/*.h" "McZapkie/*.h")
if (APPLE)
set (CMAKE_EXE_LINKER_FLAGS "-pagezero_size 10000 -image_base 100000000")
endif()
option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" OFF)
option(WITH_UART "Compile with libserialport" OFF)

View File

@@ -34,9 +34,9 @@ int main( int argc, char *argv[] )
auto result { Application.init( argc, argv ) };
if( result == 0 ) {
result = Application.run();
Application.exit();
}
Application.exit();
std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults
std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults
return result;
}
catch( std::bad_alloc const &Error )

View File

@@ -6,6 +6,12 @@
#ifndef STDAFX_H
#define STDAFX_H
#ifdef __APPLE__
#ifndef __unix__
#define __unix__ 1
#endif
#endif
#define _USE_MATH_DEFINES
#include <cmath>
#ifdef _MSC_VER