Skip to content

Commit

Permalink
Remove jsoncpp
Browse files Browse the repository at this point in the history
  • Loading branch information
nico-abram committed May 27, 2019
1 parent e3f1aef commit 7b5c562
Show file tree
Hide file tree
Showing 42 changed files with 579 additions and 10,024 deletions.
6 changes: 3 additions & 3 deletions CMake/Helpers/CMakeWindows.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ set_target_properties(Etterna PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${PROJECT_SOURCE_DIR}/Program")

# Universal Build Options
set(ETTERNA_COMPILE_FLAGS "/MP8 /GL")
set(ETTERNA_LINK_FLAGS "/SUBSYSTEM:WINDOWS /SAFESEH:NO /LTCG")
set(ETTERNA_COMPILE_FLAGS "/MP8 /INCREMENTAL")
set(ETTERNA_LINK_FLAGS "/SUBSYSTEM:WINDOWS /SAFESEH:NO /INCREMENTAL")

# Build type dependant compile flags
if (CMAKE_BUILD_TYPE STREQUAL "Release" OR "${CMAKE_GENERATOR}" STREQUAL "Ninja")
set_target_properties(SQLiteCpp sqlite3 jsoncpp lua uWS discord-rpc PROPERTIES COMPILE_FLAGS "/MT") # The following libraries are set to be dynamically linked. These compile flags switch them to be statically linked.
set_target_properties(SQLiteCpp sqlite3 lua uWS discord-rpc PROPERTIES COMPILE_FLAGS "/MT") # The following libraries are set to be dynamically linked. These compile flags switch them to be statically linked.
set(ETTERNA_COMPILE_FLAGS "${ETTERNA_COMPILE_FLAGS} /MT")
set(ETTERNA_LINK_FLAGS "${ETTERNA_LINK_FLAGS} /NODEFAULTLIB:\"LIBCMT\"")
elseif (CMAKE_BUILD_TYPE STREQUAL "Debug")
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ target_link_libraries(Etterna discord-rpc)
target_link_libraries(Etterna sqlite3)
target_link_libraries(Etterna SQLiteCpp)
target_link_libraries(Etterna uWS)
target_link_libraries(Etterna jsoncpp)
target_link_libraries(Etterna nlohmann_json)
target_link_libraries(Etterna tomcrypt)
target_link_libraries(Etterna libtommath)
Expand Down
3 changes: 1 addition & 2 deletions extern/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ add_subdirectory(LuaJIT-2.1.0-beta3)
add_subdirectory(discord-rpc)
add_subdirectory(SQLiteCpp)
add_subdirectory(json)
add_subdirectory(jsoncpp)
add_subdirectory(libtomcrypt)
add_subdirectory(libtommath)
add_subdirectory(fftw-3.3.8)
Expand Down Expand Up @@ -46,7 +45,7 @@ list(APPEND ET_EXT_TARGETS
luajit lua minilua buildvm
discord-rpc
SQLiteCpp sqlite3
jsoncpp uv uv_a
uv uv_a
tomcrypt libtommath
fftw3f glfw pcre
zlib uWS libmad
Expand Down
1 change: 0 additions & 1 deletion extern/jsoncpp/AUTHORS

This file was deleted.

7 changes: 0 additions & 7 deletions extern/jsoncpp/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion extern/jsoncpp/LICENSE

This file was deleted.

117 changes: 0 additions & 117 deletions extern/jsoncpp/README.txt

This file was deleted.

Loading

0 comments on commit 7b5c562

Please sign in to comment.