From 0b7bbdc7231bd5d4e142ff48a9f310574793a15f Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sun, 23 May 2010 15:10:49 +0000 Subject: [PATCH] Add <> to zlib and bzip includes (matters on Linux) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3065 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/PrecompiledHeader.h | 2 +- pcsx2/ZipTools/ThreadedZipTools.h | 2 +- plugins/CDVDiso/src/Windows/Win32.cpp | 2 +- plugins/CDVDiso/src/libiso.cpp | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pcsx2/PrecompiledHeader.h b/pcsx2/PrecompiledHeader.h index 681fa67572..4ed610d80d 100644 --- a/pcsx2/PrecompiledHeader.h +++ b/pcsx2/PrecompiledHeader.h @@ -76,7 +76,7 @@ typedef int BOOL; // unchanged for long periods of time, or happen to be used by almost everything, so they // need a full recompile anyway, when modified (etc) -#include "zlib/zlib.h" +#include #include "Pcsx2Defs.h" #include "i18n.h" diff --git a/pcsx2/ZipTools/ThreadedZipTools.h b/pcsx2/ZipTools/ThreadedZipTools.h index 185333f7ca..d8f79cebda 100644 --- a/pcsx2/ZipTools/ThreadedZipTools.h +++ b/pcsx2/ZipTools/ThreadedZipTools.h @@ -16,7 +16,7 @@ #pragma once #include "Utilities/PersistentThread.h" -//#include "zlib/zlib.h" +//#include using namespace Threading; diff --git a/plugins/CDVDiso/src/Windows/Win32.cpp b/plugins/CDVDiso/src/Windows/Win32.cpp index 736a1ea1b5..ead9a4acd7 100644 --- a/plugins/CDVDiso/src/Windows/Win32.cpp +++ b/plugins/CDVDiso/src/Windows/Win32.cpp @@ -7,7 +7,7 @@ #include #include -#include "zlib/zlib.h" +#include #include "Config.h" diff --git a/plugins/CDVDiso/src/libiso.cpp b/plugins/CDVDiso/src/libiso.cpp index fc0da224fa..8a4d85fa43 100644 --- a/plugins/CDVDiso/src/libiso.cpp +++ b/plugins/CDVDiso/src/libiso.cpp @@ -22,8 +22,9 @@ #include #include #include -#include "zlib/zlib.h" -#include "bzip2/bzlib.h" + +#include +#include #include "CDVDiso.h" #include "libiso.h"