Skip to content

Commit

Permalink
fix code build
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangjipeng committed Oct 8, 2024
1 parent a57fac3 commit 07399c4
Show file tree
Hide file tree
Showing 532 changed files with 21 additions and 15 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/picasso.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ExternalProject_Add(
-DOPT_EXTENSIONS=OFF
-DOPT_DEMOS=OFF
-DOPT_TESTS=OFF
-DBUILD_SHARED_LIBS=OFF
-DBUILD_SHARED_LIBS=ON
-DOPT_FORMAT_ABGR=OFF
-DOPT_FORMAT_ARGB=OFF
-DOPT_FORMAT_RGB555=OFF
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16)

project(Agave LANGUAGES C CXX ASM HOMEPAGE_URL https://github.com/onecoolx/agave)

set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CXX_STANDARD 98)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
4 changes: 2 additions & 2 deletions build/configs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ if (WIN32)
else ()
set(CMAKE_C_FLAGS_DEBUG "-D_DEBUG -O0 -Wall -fPIC -g -fno-strict-aliasing -pipe")
set(CMAKE_CXX_FLAGS_DEBUG
"-D_DEBUG -O0 -Wall -fPIC -g -fno-strict-aliasing -pipe -std=c++11 -fno-exceptions -fno-rtti")
"-D_DEBUG -O0 -Wall -fPIC -g -fno-strict-aliasing -pipe -std=c++98 -fno-exceptions -fno-rtti")
set(CMAKE_C_FLAGS_MINSIZEREL "-DNDEBUG -Os -Wall -fPIC -fno-strict-aliasing -pipe")
set(CMAKE_CXX_FLAGS_MINSIZEREL
"-DNDEBUG -Os -Wall -fPIC -fno-strict-aliasing -pipe -std=c++11 -fno-exceptions -fno-rtti")
"-DNDEBUG -Os -Wall -fPIC -fno-strict-aliasing -pipe -std=c++98 -fno-exceptions -fno-rtti")
set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_MINSIZEREL})
set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_MINSIZEREL})
set(CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_MINSIZEREL})
Expand Down
6 changes: 3 additions & 3 deletions examples/examples.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,9 @@ add_executable(${APP_MOBILE} ${APP_TYPE} ${APP_MOBILE_SRCS})

target_compile_definitions(${APP_MOBILE} PRIVATE SQLITE_HAS_CODEC)

if (WIN32)
else()
target_compile_definitions(${APP_MOBILE} PRIVATE QT5)
if (NOT WIN32)
target_compile_definitions(${APP_MOBILE} PRIVATE QT5)
target_compile_options(${APP_MOBILE} PRIVATE -std=c++11)
endif()

set_property(TARGET ${APP_MOBILE} PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
Expand Down
12 changes: 6 additions & 6 deletions src/src.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ list(REMOVE_ITEM SOURCES
${PROJ_ROOT}/src/javascript/pcre/chartables.c
${PROJ_ROOT}/src/javascript/pcre/ucptable.c
${PROJ_ROOT}/src/javascript/pcre/dftables.c
${PROJ_ROOT}/src/webcore/buildsrc/CSSPropertyNames.c
${PROJ_ROOT}/src/webcore/buildsrc/CSSValueKeywords.c
${PROJ_ROOT}/src/webcore/buildsrc/DocTypeStrings.cpp
${PROJ_ROOT}/src/webcore/buildsrc/tokenizer.cpp
${PROJ_ROOT}/src/webcore/buildsrc/JSHTMLInputElementBaseTable.cpp
${PROJ_ROOT}/src/webcore/buildKJS/CSSPropertyNames.c
${PROJ_ROOT}/src/webcore/buildKJS/CSSValueKeywords.c
${PROJ_ROOT}/src/webcore/buildKJS/DocTypeStrings.cpp
${PROJ_ROOT}/src/webcore/buildKJS/tokenizer.cpp
${PROJ_ROOT}/src/webcore/buildKJS/JSHTMLInputElementBaseTable.cpp
${PROJ_ROOT}/src/webcore/platform/unicode/UnicodeIDNA_data.cpp
${PROJ_ROOT}/src/webcore/platform/unicode/char_break_data.cpp
${PROJ_ROOT}/src/webcore/platform/unicode/line_break_data.cpp
Expand Down Expand Up @@ -47,7 +47,7 @@ target_include_directories(${LIB_NAME} PRIVATE
${PROJ_ROOT}/src/webcore/loader
${PROJ_ROOT}/src/webcore/page
${PROJ_ROOT}/src/webcore/rendering
${PROJ_ROOT}/src/webcore/buildsrc
${PROJ_ROOT}/src/webcore/buildKJS
${PROJ_ROOT}/src/webcore/bindings/js
${PROJ_ROOT}/src/webcore/platform
${PROJ_ROOT}/src/webcore/platform/graphics
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 07399c4

Please sign in to comment.