aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2017-08-12 20:47:16 -0400
committerPaul Gilbert2017-08-12 20:47:16 -0400
commit94f66142818312f9934ba79bf6b39db26b4d70a8 (patch)
treed229c96a9a8a53a201b786b2e99c456e876b8758
parent4a945162c5c53d3d8237a1feef4bdf067ff61874 (diff)
downloadscummvm-rg350-94f66142818312f9934ba79bf6b39db26b4d70a8.tar.gz
scummvm-rg350-94f66142818312f9934ba79bf6b39db26b4d70a8.tar.bz2
scummvm-rg350-94f66142818312f9934ba79bf6b39db26b4d70a8.zip
DEVTOOLS: Fix gcc compilation of create_titanic
-rw-r--r--devtools/create_titanic/create_titanic_dat.cpp4
-rw-r--r--devtools/create_titanic/zlib.cpp1
2 files changed, 1 insertions, 4 deletions
diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 4a24ec98d4..3d5e4476c9 100644
--- a/devtools/create_titanic/create_titanic_dat.cpp
+++ b/devtools/create_titanic/create_titanic_dat.cpp
@@ -29,10 +29,6 @@
#undef main
#endif // main
-#ifndef USE_ZLIB
-#error "Project should have USE_ZLIB defined"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/devtools/create_titanic/zlib.cpp b/devtools/create_titanic/zlib.cpp
index 3221d61813..96e0020e31 100644
--- a/devtools/create_titanic/zlib.cpp
+++ b/devtools/create_titanic/zlib.cpp
@@ -22,6 +22,7 @@
// Disable symbol overrides so that we can use zlib.h
#define FORBIDDEN_SYMBOL_ALLOW_ALL
+#define USE_ZLIB
#include "zlib.h"
#include "common/ptr.h"