diff --git a/addons/gdcef/gdcef/SConstruct b/addons/gdcef/gdcef/SConstruct index 9442832..e81bb63 100644 --- a/addons/gdcef/gdcef/SConstruct +++ b/addons/gdcef/gdcef/SConstruct @@ -133,8 +133,8 @@ elif platform == 'windows': env.Append(CCFLAGS=['-W3', '-GR']) env.Append(CXXFLAGS='/std:c++17') if compile_mode == 'debug': - env.Append(CPPDEFINES=['_DEBUG']) - env.Append(CCFLAGS=['-EHsc', '-MDd', '-ZI']) + env.Append(CPPDEFINES=['_DEBUG', '_ITERATOR_DEBUG_LEVEL=0']) + env.Append(CCFLAGS=['-EHsc', '-MDd', '-ZI', '-FS']) env.Append(LINKFLAGS=['-DEBUG']) else: env.Append(CPPDEFINES=['NDEBUG']) @@ -166,9 +166,13 @@ if platform == 'linux' or platform == 'osx': # OpenMP if env['cpu_parallelism']: - env.Append(CCFLAGS=['-fopenmp']) - env.Append(CXXFLAGS=['-fopenmp']) - env.Append(LINKFLAGS=['-fopenmp']) + if platform == 'windows': + env.Append(CCFLAGS=['-openmp']) + env.Append(CXXFLAGS=['-openmp']) + else: + env.Append(CCFLAGS=['-fopenmp']) + env.Append(CXXFLAGS=['-fopenmp']) + env.Append(LINKFLAGS=['-fopenmp']) # User defines env.Append(CXXFLAGS=['-DCEF_ARTIFACTS_FOLDER=' + env['cef_artifacts_folder']]) diff --git a/addons/gdcef/gdcef/src/gdcef.cpp b/addons/gdcef/gdcef/src/gdcef.cpp index 573baff..40c7402 100644 --- a/addons/gdcef/gdcef/src/gdcef.cpp +++ b/addons/gdcef/gdcef/src/gdcef.cpp @@ -534,7 +534,7 @@ void GDCef::Impl::OnBeforeClose(CefRefPtr browser) void GDCef::Impl::OnBeforeCommandLineProcessing(const CefString& ProcessType, CefRefPtr command_line) { - CEF_REQUIRE_UI_THREAD(); + //CEF_REQUIRE_UI_THREAD(); GDCEF_DEBUG(); if (command_line == nullptr) diff --git a/addons/gdcef/subprocess/SConstruct b/addons/gdcef/subprocess/SConstruct index cc3a5e2..d42af36 100644 --- a/addons/gdcef/subprocess/SConstruct +++ b/addons/gdcef/subprocess/SConstruct @@ -139,7 +139,7 @@ elif platform == 'windows': env.Append(CCFLAGS=['-W3', '-GR']) env.Append(CXXFLAGS='/std:c++17') if compile_mode == 'debug': - env.Append(CPPDEFINES=['_DEBUG']) + env.Append(CPPDEFINES=['_DEBUG', '_ITERATOR_DEBUG_LEVEL=0']) env.Append(CCFLAGS=['-EHsc', '-MDd', '-ZI']) env.Append(LINKFLAGS=['-DEBUG']) else: