fix: restore linux mingw client build and gm smoke
This commit is contained in:
5
extern/include/python/cpython/pydebug.h
vendored
5
extern/include/python/cpython/pydebug.h
vendored
@@ -13,7 +13,12 @@ Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_InspectFlag;
|
||||
Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_OptimizeFlag;
|
||||
Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_NoSiteFlag;
|
||||
Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_BytesWarningFlag;
|
||||
#if defined(__MINGW32__)
|
||||
PyAPI_FUNC(int*) M2_GetPyFrozenFlagPtr(void);
|
||||
#define Py_FrozenFlag (*M2_GetPyFrozenFlagPtr())
|
||||
#else
|
||||
Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_FrozenFlag;
|
||||
#endif
|
||||
Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_IgnoreEnvironmentFlag;
|
||||
Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_DontWriteBytecodeFlag;
|
||||
Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_NoUserSiteDirectory;
|
||||
|
||||
2
extern/include/python/python.h
vendored
Normal file
2
extern/include/python/python.h
vendored
Normal file
@@ -0,0 +1,2 @@
|
||||
#pragma once
|
||||
#include "Python.h"
|
||||
6
extern/library/DirectX/CMakeLists.txt
vendored
6
extern/library/DirectX/CMakeLists.txt
vendored
@@ -1,3 +1,7 @@
|
||||
add_library(DirectX INTERFACE)
|
||||
target_include_directories(DirectX INTERFACE "${CMAKE_SOURCE_DIR}/extern/include")
|
||||
target_link_libraries(DirectX INTERFACE "${CMAKE_CURRENT_LIST_DIR}/d3d9.lib" "${CMAKE_CURRENT_LIST_DIR}/d3dx9.lib" "${CMAKE_CURRENT_LIST_DIR}/dinput8.lib" "${CMAKE_CURRENT_LIST_DIR}/dxguid.lib")
|
||||
if(MSVC)
|
||||
target_link_libraries(DirectX INTERFACE "${CMAKE_CURRENT_LIST_DIR}/d3d9.lib" "${CMAKE_CURRENT_LIST_DIR}/d3dx9.lib" "${CMAKE_CURRENT_LIST_DIR}/dinput8.lib" "${CMAKE_CURRENT_LIST_DIR}/dxguid.lib")
|
||||
else()
|
||||
target_link_libraries(DirectX INTERFACE "${CMAKE_CURRENT_LIST_DIR}/d3d9.lib" "${CMAKE_CURRENT_LIST_DIR}/d3dx9.lib" "${CMAKE_CURRENT_LIST_DIR}/dinput8.lib")
|
||||
endif()
|
||||
|
||||
18
extern/library/Python/CMakeLists.txt
vendored
18
extern/library/Python/CMakeLists.txt
vendored
@@ -1,7 +1,15 @@
|
||||
add_library(Python INTERFACE)
|
||||
target_include_directories(Python INTERFACE "${CMAKE_SOURCE_DIR}/extern/include")
|
||||
target_link_libraries(Python INTERFACE
|
||||
"${CMAKE_CURRENT_LIST_DIR}/python314_static.lib"
|
||||
pathcch
|
||||
bcrypt
|
||||
)
|
||||
if(MSVC)
|
||||
target_link_libraries(Python INTERFACE
|
||||
"${CMAKE_CURRENT_LIST_DIR}/python314_static.lib"
|
||||
pathcch
|
||||
bcrypt
|
||||
)
|
||||
else()
|
||||
target_link_libraries(Python INTERFACE
|
||||
"${CMAKE_CURRENT_LIST_DIR}/libpython314.dll.a"
|
||||
pathcch
|
||||
bcrypt
|
||||
)
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user