this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Separated stb-image and stb-image-write so bundling one won't interfere with the other.

+13 -4
+11 -2
CMakeLists.txt
··· 235 235 include_directories(src/externals/glew/GL) 236 236 endif(NOT GLEW_FOUND) 237 237 238 - if(NOT STBI_FOUND) 239 - include_directories(src/externals/stb_image) 238 + # Set stuff up for using bundled stbi 239 + if(NOT STBI_FOUND OR NOT STBI_WRITE_FOUND) 240 240 add_definitions("-DSTBI_FAILURE_USERMSG") 241 + 242 + if(NOT STBI_FOUND) 243 + include_directories(src/externals/stb_image) 244 + endif(NOT STBI_FOUND) 245 + 246 + if(NOT STBI_WRITE_FOUND) 247 + include_directories(src/externals/stb_image_write) 248 + endif(NOT STBI_WRITE_FOUND) 241 249 endif(NOT STBI_FOUND) 250 + 242 251 243 252 244 253 add_definitions("-Wall -std=c99 -pedantic")
+2 -2
src/CMakeLists.txt
··· 42 42 include_directories(${STBI_WRITE_INCLUDE_DIR}) 43 43 link_libraries (${STBI_WRITE_LIBRARY}) 44 44 else(STBI_WRITE_FOUND) 45 - SET(SDL_gpu_SRCS ${SDL_gpu_SRCS} externals/stb_image/stb_image_write.c) 46 - SET(SDL_gpu_HDRS ${SDL_gpu_HDRS} externals/stb_image/stb_image_write.h) 45 + SET(SDL_gpu_SRCS ${SDL_gpu_SRCS} externals/stb_image_write/stb_image_write.c) 46 + SET(SDL_gpu_HDRS ${SDL_gpu_HDRS} externals/stb_image_write/stb_image_write.h) 47 47 endif(STBI_WRITE_FOUND) 48 48 49 49
src/externals/stb_image/stb_image_write.c src/externals/stb_image_write/stb_image_write.c
src/externals/stb_image/stb_image_write.h src/externals/stb_image_write/stb_image_write.h