diff --git a/Source/src/CMakeLists.txt b/Source/src/CMakeLists.txt index fecc4ece..7cf56942 100644 --- a/Source/src/CMakeLists.txt +++ b/Source/src/CMakeLists.txt @@ -91,7 +91,7 @@ INCLUDE_DIRECTORIES( ${Thirdparty}/OpenSceneGraph-3.6.5/include ${Thirdparty}/osgOcean/include ${Thirdparty}/matlab/include - ${Thirdparty}/Python39/include +# ${Thirdparty}/Python39/include ) LINK_DIRECTORIES( @@ -99,8 +99,8 @@ INCLUDE_DIRECTORIES( ${Thirdparty}/3rdParty_x64/lib ${Thirdparty}/OpenSceneGraph-3.6.5/lib ${Thirdparty}/osgOcean/lib - ${Thirdparty}/matlab/lib/win64/microsoft - ${Thirdparty}/Python39/libs + ${Thirdparty}/matlab/lib/win64/microsoft +# ${Thirdparty}/Python39/libs ) if(MSVC) @@ -169,7 +169,7 @@ target_link_libraries( osgSim libMatlabDataArray libMatlabEngine - python39 +# python39 ) if(${QT_VERSION_MAJOR} LESS 6) diff --git a/Source/src/app/Application.cpp b/Source/src/app/Application.cpp index 20d8be63..11ce89c2 100644 --- a/Source/src/app/Application.cpp +++ b/Source/src/app/Application.cpp @@ -31,11 +31,11 @@ void Application::Init() { Singleton::Create(this); Singleton::Create(this); Singleton::Create(this); - Singleton::Create(this); + //Singleton::Create(this); } void Application::Uninit() { - Singleton::Destory(); + //Singleton::Destory(); Singleton::Destory(); Singleton::Destory(); Singleton::Destory(); diff --git a/Source/src/python/PythonModule.cpp b/Source/src/python/PythonModule.cpp index 0d3aee00..3cf39e9b 100644 --- a/Source/src/python/PythonModule.cpp +++ b/Source/src/python/PythonModule.cpp @@ -1,3 +1,4 @@ +#if 0 #include "python/PythonModule.h" #include @@ -86,3 +87,4 @@ bool PythonModule::InitEnv() { } return true; } +#endif diff --git a/Source/src/python/PythonModule.h b/Source/src/python/PythonModule.h index 64e0a3e7..b0d4c962 100644 --- a/Source/src/python/PythonModule.h +++ b/Source/src/python/PythonModule.h @@ -1,5 +1,6 @@ #pragma once +#if 0 #include #include @@ -26,4 +27,5 @@ private: bool init_{ false }; -}; \ No newline at end of file +}; +#endif