浏览代码

Always include "zlib.h" (rather than .../contrib/zlib/zlib.h)

The path to the vendored zlib is set by the build-system,
so there's no need to add additional preprocessor magic
IOhannes m zmölnig 2 年之前
父节点
当前提交
bfdd154d14
共有 3 个文件被更改,包括 3 次插入15 次删除
  1. 1 5
      code/AssetLib/Assbin/AssbinFileWriter.cpp
  2. 1 5
      code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp
  3. 1 5
      code/Common/Compression.h

+ 1 - 5
code/AssetLib/Assbin/AssbinFileWriter.cpp

@@ -50,11 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/version.h>
 #include <assimp/IOStream.hpp>
 
-#ifdef ASSIMP_BUILD_NO_OWN_ZLIB
-#include <zlib.h>
-#else
-#include "../contrib/zlib/zlib.h"
-#endif
+#include "zlib.h"
 
 #include <ctime>
 

+ 1 - 5
code/AssetLib/Q3BSP/Q3BSPFileImporter.cpp

@@ -48,11 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <assimp/DefaultLogger.hpp>
 
-#ifdef ASSIMP_BUILD_NO_OWN_ZLIB
-#include <zlib.h>
-#else
-#include "../contrib/zlib/zlib.h"
-#endif
+#include "zlib.h"
 
 #include <assimp/DefaultIOSystem.h>
 #include <assimp/StringComparison.h>

+ 1 - 5
code/Common/Compression.h

@@ -41,11 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 
-#ifdef ASSIMP_BUILD_NO_OWN_ZLIB
-#   include <zlib.h>
-#else
-#   include "../contrib/zlib/zlib.h"
-#endif
+#include "zlib.h"
 
 #include <vector>
 #include <cstddef> // size_t