Upgrade ogg 1.3.2 -> 1.3.5 and move to submodule
This commit is contained in:
+1
-7
@@ -562,7 +562,6 @@ if(NOT APPLE)
|
||||
if(MSVC)
|
||||
if(WITH_OGG)
|
||||
list(APPEND SM_INCLUDE_DIRS
|
||||
"${SM_EXTERN_DIR}/newogg/include"
|
||||
"${SM_EXTERN_DIR}/newvorbis/lib"
|
||||
"${SM_EXTERN_DIR}/newvorbis/include")
|
||||
endif()
|
||||
@@ -591,8 +590,7 @@ if(NOT APPLE)
|
||||
endif()
|
||||
else()
|
||||
if(WITH_OGG)
|
||||
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/newogg/include"
|
||||
"${SM_EXTERN_DIR}/newvorbis/include")
|
||||
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/newvorbis/include")
|
||||
endif()
|
||||
list(APPEND SM_INCLUDE_DIRS "archutils/Unix")
|
||||
if(HAS_FFMPEG)
|
||||
@@ -606,10 +604,6 @@ if(WIN32)
|
||||
#list(APPEND SM_INCLUDE_DIRS ${DIRECTX_INCLUDE_DIR})
|
||||
endif()
|
||||
|
||||
if(NOT WITH_SYSTEM_PNG)
|
||||
list(APPEND SM_INCLUDE_DIRS "${SM_EXTERN_DIR}/libpng")
|
||||
endif()
|
||||
|
||||
if(NOT WITH_SYSTEM_TOMCRYPT)
|
||||
list(APPEND SM_INCLUDE_DIRS "${SM_SRC_DIR}/libtomcrypt/src/headers")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user