Skip to content

Commit

Permalink
Merge pull request #27 from ntkwan/main
Browse files Browse the repository at this point in the history
Update hoang branch to newest
  • Loading branch information
hoangfitus authored Dec 13, 2023
2 parents 84934e4 + 29019b0 commit 361227f
Show file tree
Hide file tree
Showing 1,016 changed files with 24,302 additions and 185,036 deletions.
30 changes: 0 additions & 30 deletions .clang-uml

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
sudo apt-get upgrade
sudo apt-get install cmake clang-format
sudo apt-get install libpthread-stubs0-dev libgl1-mesa-dev libx11-dev libxrandr-dev libfreetype6-dev libjpeg8-dev libsndfile1-dev libopenal-dev libudev-dev libxinerama-dev libxcursor-dev libxi-dev
sudo apt-get install wine64
sudo apt-get install gcc-mingw-w64 mingw-w64
- name: Run clang-format
run: clang-format --dry-run --Werror src/**/*.*pp
- name: Run CMake
Expand Down
18 changes: 13 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
if (UNIX)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/windows.cmake CACHE STRING "Windows toolchain file")
endif()

cmake_minimum_required(VERSION 3.14)
project(svg-reader VERSION 0.2)

Expand All @@ -11,15 +15,19 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
find_package(Git)
message(STATUS "GIT_EXECUTABLE='${GIT_EXECUTABLE}'")

find_package(sfml QUIET)

add_subdirectory(external/SFML)
add_subdirectory(external/rapidxml)
include_directories(src)
if (LINUX)
if (UNIX)
add_compile_options(-fsanitize=address)
add_link_options(-fsanitize=address)
endif()

add_compile_options(-static-libgcc)
add_compile_options(-static-libstdc++)
add_link_options(-static-libgcc)
add_link_options(-static-libstdc++)
file(GLOB_RECURSE cpp_files CONFIGURE_DEPENDS "src/*.*pp")
add_executable(${PROJECT_NAME} ${cpp_files})

target_link_libraries(${PROJECT_NAME} PRIVATE sfml-graphics)
target_link_libraries(${PROJECT_NAME} PUBLIC -lgdiplus)

2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "svg-reader"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 0.1
PROJECT_NUMBER = 0.2

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
Binary file added docs/diagrams/All.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 361227f

Please sign in to comment.