Skip to content

Commit 2e16cc0

Browse files
committed
Rename SOIL2 vendor lib to stb_image and remove SOIL2 code
1 parent 8b4a4d8 commit 2e16cc0

33 files changed

Lines changed: 40 additions & 4744 deletions

src/libprojectM/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ target_link_libraries(projectM_main
3636
MilkdropPreset
3737
Renderer
3838
hlslparser
39-
SOIL2
39+
stb_image
4040
libprojectM::API
4141
${PROJECTM_FILESYSTEM_LIBRARY}
4242
)
@@ -67,7 +67,7 @@ add_library(projectM
6767
$<TARGET_OBJECTS:Renderer>
6868
$<TARGET_OBJECTS:UserSprites>
6969
$<TARGET_OBJECTS:hlslparser>
70-
$<TARGET_OBJECTS:SOIL2>
70+
$<TARGET_OBJECTS:stb_image>
7171
$<TARGET_OBJECTS:projectM_main>
7272
$<TARGET_OBJECTS:projectM::Eval>
7373
)

src/libprojectM/Renderer/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ target_link_libraries(Renderer
7575
PUBLIC
7676
GLM::GLM
7777
hlslparser
78-
SOIL2
78+
stb_image
7979
)
8080

8181
set_target_properties(Renderer PROPERTIES

src/libprojectM/Renderer/TextureManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <Logging.hpp>
99
#include <Utils.hpp>
1010

11-
#include <SOIL2/stb_image.h>
11+
#include <stb_image.h>
1212

1313
#include <algorithm>
1414
#include <cstdlib>

tests/libprojectM/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ add_executable(projectM-unittest
3737
$<TARGET_OBJECTS:Renderer>
3838
$<TARGET_OBJECTS:UserSprites>
3939
$<TARGET_OBJECTS:hlslparser>
40-
$<TARGET_OBJECTS:SOIL2>
40+
$<TARGET_OBJECTS:stb_image>
4141
$<TARGET_OBJECTS:projectM_main>
4242
)
4343

vendor/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ add_subdirectory(hlslparser)
55
if(NOT TARGET projectM::Eval)
66
add_subdirectory(projectm-eval)
77
endif()
8-
add_subdirectory(SOIL2)
8+
add_subdirectory(stb_image)

vendor/SOIL2/CMakeLists.txt

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

0 commit comments

Comments
 (0)