[sm130futures] Good on Windows...and Mac too?

We'll see if I'm lucky here.
This commit is contained in:
Jason Felds
2011-05-04 23:22:51 -04:00
parent 94d6cd9eb3
commit b89dcc548f
4 changed files with 11 additions and 11 deletions
+3 -3
View File
@@ -11,11 +11,11 @@
// work around namespace bugs in win32/libjpeg:
#define XMD_H
#undef FAR
#include "libjpeg/jpeglib.h"
#include "libjpeg/jerror.h"
#include "../extern/libjpeg/jpeglib.h"
#include "../extern/libjpeg/jerror.h"
#if defined(_MSC_VER)
#pragma comment(lib, "libjpeg/jpeg.lib")
#pragma comment(lib, "../extern/libjpeg/jpeg.lib")
#endif
#pragma warning(disable: 4611) /* interaction between '_setjmp' and C++ object destruction is non-portable */