Skip to content

Commit 25d3710

Browse files
committed
chore: remove obsolete cpp code and only download skia for windows build
1 parent 4a282ae commit 25d3710

File tree

4 files changed

+3
-193
lines changed

4 files changed

+3
-193
lines changed

native/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ set(CMAKE_CXX_STANDARD 23)
2121
set(CMAKE_CXX_STANDARD_REQUIRED ON)
2222
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
2323

24-
include(cmake/skia.cmake)
25-
2624
set(SOURCES
27-
25+
src/cpp/library.cpp
2826
)
2927

3028
if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -33,12 +31,10 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
3331
endif ()
3432

3533
list(APPEND SOURCES
36-
src/cpp/linux/GLXContext.cpp
3734
)
3835
elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
3936
list(APPEND SOURCES
4037
src/cpp/windows/D3DInterop.cpp
41-
src/cpp/windows/WGLContext.cpp
4238
)
4339
endif ()
4440

@@ -55,6 +51,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
5551
target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::GL)
5652
target_include_directories(${PROJECT_NAME} PUBLIC "${JAVA_HOME}/include/linux")
5753
elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
54+
include(cmake/skia.cmake)
5855
target_compile_definitions(${PROJECT_NAME} PRIVATE -D_WINDOWS)
5956
target_compile_definitions(${PROJECT_NAME} PRIVATE SK_DIRECT3D NOMINMAX WIN32_LEAN_AND_MEAN)
6057
target_compile_options(${PROJECT_NAME} PRIVATE /MT)

native/src/cpp/library.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// empty

native/src/cpp/linux/GLXContext.cpp

Lines changed: 0 additions & 172 deletions
This file was deleted.

native/src/cpp/windows/WGLContext.cpp

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)