Commit edbc602c authored by oscar's avatar oscar

提交修改

parent 52a9d1d3
Pipeline #877 failed with stages
python_so/out/
...@@ -28,8 +28,8 @@ INCLUDE_DIRECTORIES( ...@@ -28,8 +28,8 @@ INCLUDE_DIRECTORIES(
if(TARGET_CORE_LIB ) if(TARGET_CORE_LIB )
file(GLOB SRC_LIST file(GLOB SRC_LIST
"../offline/Core/*.cpp" "../jfxmap/offline/Core/*.cpp"
"../submodules/xxtea-c/*.c" "../jfxmap/submodules/xxtea-c/*.c"
) )
add_library(jfxmap_python SHARED ${SRC_LIST} MapInterface.cpp jfxmap_python.cpp) add_library(jfxmap_python SHARED ${SRC_LIST} MapInterface.cpp jfxmap_python.cpp)
set_target_properties(jfxmap_python PROPERTIES OUTPUT_NAME "jfxmap_python") set_target_properties(jfxmap_python PROPERTIES OUTPUT_NAME "jfxmap_python")
...@@ -40,10 +40,10 @@ if(TARGET_CORE_LIB ) ...@@ -40,10 +40,10 @@ if(TARGET_CORE_LIB )
endif() endif()
set(local_include_directories set(local_include_directories
${local_include_directories} ${local_include_directories}
${PROJECT_SOURCE_DIR}/../offline/Core ${PROJECT_SOURCE_DIR}/../jfxmap/offline/Core
${PROJECT_SOURCE_DIR}/../offline/Public ${PROJECT_SOURCE_DIR}/../jfxmap/offline/Public
${PROJECT_SOURCE_DIR}/../submodules/ajson ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/ajson
${PROJECT_SOURCE_DIR}/../submodules/spdlog/include ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/spdlog/include
) )
endif() endif()
...@@ -97,13 +97,13 @@ endif() ...@@ -97,13 +97,13 @@ endif()
set(local_include_directories set(local_include_directories
${local_include_directories} ${local_include_directories}
${PROJECT_SOURCE_DIR}/../submodules/ajson ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/ajson
${PROJECT_SOURCE_DIR}/../submodules/tinyxml/include ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/tinyxml/include
${PROJECT_SOURCE_DIR}/../submodules/boolinq/include/boolinq ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/boolinq/include/boolinq
${PROJECT_SOURCE_DIR}/../submodules/jfxthread/include ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/jfxthread/include
${PROJECT_SOURCE_DIR}/../submodules/queue-thread-safe ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/queue-thread-safe
${PROJECT_SOURCE_DIR}/../submodules/spdlog/include ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/spdlog/include
${PROJECT_SOURCE_DIR}/../submodules/xxtea-c ${PROJECT_SOURCE_DIR}/../jfxmap/submodules/xxtea-c
) )
include_directories(${local_include_directories}) include_directories(${local_include_directories})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment