diff --git a/main.cpp b/main.cpp index 1f2357c..6ff651f 100644 --- a/main.cpp +++ b/main.cpp @@ -14,7 +14,15 @@ //#include "document.h" #include "html.h" #include "tinyxml.h" -#include + + +#ifndef _WIN32 +# include +# define __cdecl +int fopen_s(FILE** a_file, const char* a_fileName, const char* a_mode); +#else +# include +#endif #define DEF_IUNIT 1024 @@ -39,6 +47,7 @@ static void RemoveFile(const char* fileName) { +#ifdef _WIN32 FILE* tmpF = 0; bool first = true; do @@ -57,6 +66,9 @@ fflush(stdout); } } while (tmpF != 0); +#else + unlink(fileName); +#endif } @@ -177,6 +189,7 @@ g_currentModule.m_messageLogger = &logger; appWindow.setupUi(&mainWindow); + mainWindow.menuBar()->setNativeMenuBar(false); about.setupUi(&aboutDialog); aboutDialog.setFixedSize(430, 300); @@ -187,8 +200,6 @@ } }; -#endif - #include @@ -380,7 +391,7 @@ -#include "c:\Users\John\Desktop\Euclideon\model-iterator.cpp" +//#include "c:\Users\John\Desktop\Euclideon\model-iterator.cpp" @@ -584,6 +595,7 @@ }; +#endif int main(int argc, char* argv[])