Mac更新脚本

Arona/CMakeLists.txt

@@ -1,14 +1,14 @@
-project(arona)
-set(CMAKE_CXX_STANDARD 26)
+project(arona LANGUAGES C CXX)
+set(CMAKE_CXX_STANDARD 23)
 
 # 设置Windows应用程序的入口点
 if (WIN32)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /ENTRY:WinMainCRTStartup")
 endif()
 
-set(wxBUILD_CXX_STANDARD 20)
-
-# 添加hikogui子目录
+set(wxBUILD_CXX_STANDARD 20 CACHE STRING "C++ standard to use (20 or 17)" FORCE)
+set(wxBUILD_SHARED OFF CACHE BOOL "Build shared libraries" FORCE)
+# 添加wxWidget子目录
 add_subdirectory(third_party/wxWidgets)
 
 # 遍历添加源文件
@@ -26,9 +26,11 @@ if (WIN32)
     target_sources(${PROJECT_NAME} PRIVATE "manifest.rc")
     set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/MANIFEST:NO")
 endif ()
-if (MACOS)
+if (APPLE)
     set_target_properties(${PROJECT_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/info.plist)
 endif ()
+add_compile_definitions(-D__cplusplus)
+add_compile_definitions(-D_POSIX_C_SOURCE=200809L)
 #install(
 #        TARGETS ${PROJECT_NAME} DESTINATION
 #        RESOURCE DESTINATION ../bin/resources)

update.sh

@@ -0,0 +1,7 @@
+git pull
+cd Arona/third_party/wxWidgets
+git pull origin master
+cd ../../..
+
+cd AronaCore
+./update.sh