[Scummvm-git-logs] scummvm master -> 94f66142818312f9934ba79bf6b39db26b4d70a8

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
94f6614281 DEVTOOLS: Fix gcc compilation of create_titanic


Commit: 94f66142818312f9934ba79bf6b39db26b4d70a8
    https://github.com/scummvm/scummvm/commit/94f66142818312f9934ba79bf6b39db26b4d70a8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-12T20:47:16-04:00

Commit Message:
DEVTOOLS: Fix gcc compilation of create_titanic

Changed paths:
    devtools/create_titanic/create_titanic_dat.cpp
    devtools/create_titanic/zlib.cpp


diff --git a/devtools/create_titanic/create_titanic_dat.cpp b/devtools/create_titanic/create_titanic_dat.cpp
index 4a24ec9..3d5e447 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 3221d61..96e0020 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"