From 36e05d261821048a4c2fec1042434dd2dfc9b6de Mon Sep 17 00:00:00 2001 From: taynpg Date: Sat, 15 Feb 2025 23:32:39 +0800 Subject: [PATCH] =?UTF-8?q?config=EF=BC=9A=E9=A1=B9=E7=9B=AE=E8=AE=BE?= =?UTF-8?q?=E7=BD=AEboost=E5=8F=AA=E9=92=88=E5=AF=B9=E5=85=B7=E4=BD=93?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 11 ++++++++++- src/of_path.cpp | 2 +- xmake.lua | 27 --------------------------- 3 files changed, 11 insertions(+), 29 deletions(-) delete mode 100644 xmake.lua diff --git a/CMakeLists.txt b/CMakeLists.txt index ab53d5b..5cea998 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,9 +30,18 @@ if(DEFINED USE_TEST) enable_testing() add_subdirectory(test) endif() +if(DEFINED MINGW32_XP_BOOST) +message(STATUS "ofen use mingw32 xp boost.") +include_directories(${MBOOST_INCLUDE_DIR}) +link_directories(${MBOOST_LIB_DIR}) +endif() set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}) add_library(ofen STATIC ${SRC_FILES}) -target_include_directories(ofen PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/3rd) \ No newline at end of file +target_include_directories(ofen PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/3rd) +if(DEFINED MINGW32_XP_BOOST) +target_link_directories(ofen PRIVATE ${MBOOST_LIB_DIR}) +target_link_libraries(ofen PRIVATE ${MBOOST_LIBS}) +endif() \ No newline at end of file diff --git a/src/of_path.cpp b/src/of_path.cpp index dfca1d1..155bc2c 100644 --- a/src/of_path.cpp +++ b/src/of_path.cpp @@ -3,7 +3,7 @@ #include #include -#ifdef USE_BOOST_FILESYSTEM +#ifdef MINGW32_XP_BOOST #include namespace fs = boost::filesystem; #else diff --git a/xmake.lua b/xmake.lua deleted file mode 100644 index 10e86f9..0000000 --- a/xmake.lua +++ /dev/null @@ -1,27 +0,0 @@ -add_rules("mode.debug", "mode.release") -set_languages("c++17") -if is_plat("windows") then - add_cxxflags("/source-charset:utf-8") -end -if is_plat("mingw") then - add_cxxflags("-Wno-unused-variable -finput-charset=utf-8 -fexec-charset=gbk") -end -if is_mode("debug") then - set_suffixname("d") -end -add_includedirs(path.join(os.scriptdir(), "include"), {public = true}) -add_includedirs(path.join(os.scriptdir(), "3rd"), {public = true}) -target("ofen") - add_options("boost") - set_kind("static") - add_files("src/*.cpp") -option("boost") - set_default(false) - set_showmenu(true) - boost_root_dir = os.getenv("BOOST_HEADER_DIR") - boost_lib_dir = os.getenv("BOOST_LIB_DIR") - boost_libs = os.getenv("BOOST_LIBS") - add_includedirs(boost_root_dir) - add_defines("USE_BOOST_FILESYSTEM") - add_linkdirs(boost_lib_dir) - add_links(boost_libs) \ No newline at end of file