mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-03-22 15:05:03 +01:00
fix compiling on MacOS
This commit is contained in:
@@ -30,6 +30,10 @@ file(GLOB HEADERS "*.h"
|
||||
"network/backend/*.h"
|
||||
"widgets/*.h")
|
||||
|
||||
if (APPLE)
|
||||
set (CMAKE_EXE_LINKER_FLAGS "-pagezero_size 10000 -image_base 100000000")
|
||||
endif()
|
||||
|
||||
option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" ON)
|
||||
option(WITH_UART "Compile with libserialport" OFF)
|
||||
|
||||
|
||||
2
EU07.cpp
2
EU07.cpp
@@ -34,8 +34,8 @@ int main( int argc, char *argv[] )
|
||||
auto result { Application.init( argc, argv ) };
|
||||
if( result == 0 ) {
|
||||
result = Application.run();
|
||||
Application.exit();
|
||||
}
|
||||
Application.exit();
|
||||
}
|
||||
catch( std::bad_alloc const &Error )
|
||||
{
|
||||
|
||||
6
stdafx.h
6
stdafx.h
@@ -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
|
||||
|
||||
@@ -10,7 +10,7 @@ class popup {
|
||||
|
||||
public:
|
||||
popup(ui_panel &panel);
|
||||
~popup();
|
||||
virtual ~popup();
|
||||
|
||||
bool render();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user