diff options
| author | Aki <please@ignore.pl> | 2024-04-05 20:57:38 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2024-04-05 20:57:51 +0200 |
| commit | effc8802a77375437b676ac4534789e819731671 (patch) | |
| tree | 4b752b61487bef73f3fce28c1f0a402f0a3ecc76 | |
| parent | beeacf69d68f366cbbc9701bb7dabd23a898c8c7 (diff) | |
| download | starshatter-effc8802a77375437b676ac4534789e819731671.zip starshatter-effc8802a77375437b676ac4534789e819731671.tar.gz starshatter-effc8802a77375437b676ac4534789e819731671.tar.bz2 | |
l3ds is a third party library
| -rw-r--r-- | MagicEx/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | NOTICE | 4 | ||||
| -rw-r--r-- | third-party/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | third-party/l3ds/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | third-party/l3ds/include/l3ds.h (renamed from MagicEx/l3ds.h) | 2 | ||||
| -rw-r--r-- | third-party/l3ds/l3ds.cpp (renamed from MagicEx/l3ds.cpp) | 2 |
6 files changed, 12 insertions, 4 deletions
diff --git a/MagicEx/CMakeLists.txt b/MagicEx/CMakeLists.txt index 965312c..9c8038a 100644 --- a/MagicEx/CMakeLists.txt +++ b/MagicEx/CMakeLists.txt @@ -1,10 +1,9 @@ project(MagicEx) add_library( ${PROJECT_NAME} STATIC - l3ds.cpp MagicLoad.cpp ModelFile3DS.cpp ModelFileMAG.cpp ModelFileOBJ.cpp) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(${PROJECT_NAME} PUBLIC StarsEx) +target_link_libraries(${PROJECT_NAME} PUBLIC StarsEx PRIVATE l3ds) @@ -62,3 +62,7 @@ Starshatter: The Open Source Project uses googletest: Copyright 2008, Google Inc. googletest is reeleased under BSD 3-Clause license. See <third-party/gtest/LICENSE>. + + +Starshatter: The Open Source Project uses l3ds: +Copyright (c) 2001, Lev Povalahev diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 2c9f2f1..5b1d796 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -10,6 +10,7 @@ add_subdirectory(zlib) make_available(gtest infoware libpng ogg vorbis zlib) add_subdirectory(Opcode) add_subdirectory(sha1) +add_subdirectory(l3ds) install( TARGETS png15 Opcode RUNTIME diff --git a/third-party/l3ds/CMakeLists.txt b/third-party/l3ds/CMakeLists.txt new file mode 100644 index 0000000..89c13d2 --- /dev/null +++ b/third-party/l3ds/CMakeLists.txt @@ -0,0 +1,4 @@ +project(l3ds) +add_library(${PROJECT_NAME} SHARED l3ds.cpp) +target_include_directories(${PROJECT_NAME} PUBLIC include) +install(TARGETS ${PROJECT_NAME} RUNTIME COMPONENT Runtime DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/MagicEx/l3ds.h b/third-party/l3ds/include/l3ds.h index ea0a032..69a8e6d 100644 --- a/MagicEx/l3ds.h +++ b/third-party/l3ds/include/l3ds.h @@ -454,4 +454,4 @@ protected: //--------------------------------------------------------- -#endif
\ No newline at end of file +#endif diff --git a/MagicEx/l3ds.cpp b/third-party/l3ds/l3ds.cpp index 4c34ab5..50b27b8 100644 --- a/MagicEx/l3ds.cpp +++ b/third-party/l3ds/l3ds.cpp @@ -1787,4 +1787,4 @@ long L3DS::ReadKeyheader() ReadFloat(); } return frame; -}
\ No newline at end of file +} |