remove python and even
This commit is contained in:
parent
0c37551766
commit
1c07e198c9
@ -91,7 +91,7 @@ INCLUDE_DIRECTORIES(
|
|||||||
${Thirdparty}/OpenSceneGraph-3.6.5/include
|
${Thirdparty}/OpenSceneGraph-3.6.5/include
|
||||||
${Thirdparty}/osgOcean/include
|
${Thirdparty}/osgOcean/include
|
||||||
${Thirdparty}/matlab/include
|
${Thirdparty}/matlab/include
|
||||||
${Thirdparty}/Python39/include
|
# ${Thirdparty}/Python39/include
|
||||||
)
|
)
|
||||||
|
|
||||||
LINK_DIRECTORIES(
|
LINK_DIRECTORIES(
|
||||||
@ -99,8 +99,8 @@ INCLUDE_DIRECTORIES(
|
|||||||
${Thirdparty}/3rdParty_x64/lib
|
${Thirdparty}/3rdParty_x64/lib
|
||||||
${Thirdparty}/OpenSceneGraph-3.6.5/lib
|
${Thirdparty}/OpenSceneGraph-3.6.5/lib
|
||||||
${Thirdparty}/osgOcean/lib
|
${Thirdparty}/osgOcean/lib
|
||||||
${Thirdparty}/matlab/lib/win64/microsoft
|
${Thirdparty}/matlab/lib/win64/microsoft
|
||||||
${Thirdparty}/Python39/libs
|
# ${Thirdparty}/Python39/libs
|
||||||
)
|
)
|
||||||
|
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
@ -169,7 +169,7 @@ target_link_libraries(
|
|||||||
osgSim
|
osgSim
|
||||||
libMatlabDataArray
|
libMatlabDataArray
|
||||||
libMatlabEngine
|
libMatlabEngine
|
||||||
python39
|
# python39
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${QT_VERSION_MAJOR} LESS 6)
|
if(${QT_VERSION_MAJOR} LESS 6)
|
||||||
|
@ -31,11 +31,11 @@ void Application::Init() {
|
|||||||
Singleton<EntitiesManager>::Create(this);
|
Singleton<EntitiesManager>::Create(this);
|
||||||
Singleton<WorkSpaceManager>::Create(this);
|
Singleton<WorkSpaceManager>::Create(this);
|
||||||
Singleton<NetDriver>::Create(this);
|
Singleton<NetDriver>::Create(this);
|
||||||
Singleton<PythonModule>::Create(this);
|
//Singleton<PythonModule>::Create(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::Uninit() {
|
void Application::Uninit() {
|
||||||
Singleton<PythonModule>::Destory();
|
//Singleton<PythonModule>::Destory();
|
||||||
Singleton<NetDriver>::Destory();
|
Singleton<NetDriver>::Destory();
|
||||||
Singleton<WorkSpaceManager>::Destory();
|
Singleton<WorkSpaceManager>::Destory();
|
||||||
Singleton<EntitiesManager>::Destory();
|
Singleton<EntitiesManager>::Destory();
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
#if 0
|
||||||
#include "python/PythonModule.h"
|
#include "python/PythonModule.h"
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
@ -86,3 +87,4 @@ bool PythonModule::InitEnv() {
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#if 0
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
@ -27,3 +28,4 @@ private:
|
|||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user