[Scummvm-git-logs] scummvm master -> 96103179af909894d9ca71fb69b8f1121591f518

[bluegr]

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:
96103179af SCI: Fix build when SCI32 isn't enabled


Commit: 96103179af909894d9ca71fb69b8f1121591f518
    https://github.com/scummvm/scummvm/commit/96103179af909894d9ca71fb69b8f1121591f518
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2019-07-08T10:15:09+03:00

Commit Message:
SCI: Fix build when SCI32 isn't enabled

Changed paths:
    engines/sci/engine/kmisc.cpp
    engines/sci/module.mk


diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 4259509..7c7e5ae 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -36,7 +36,9 @@
 #endif
 #include "sci/graphics/maciconbar.h"
 #include "sci/console.h"
+#ifdef ENABLE_SCI32
 #include "sci/engine/hoyle5poker.h"
+#endif
 
 namespace Sci {
 
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index e73d8c3..6cf0cad 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -13,7 +13,6 @@ MODULE_OBJS := \
 	engine/file.o \
 	engine/gc.o \
 	engine/guest_additions.o \
-	engine/hoyle5poker.o \
 	engine/kernel.o \
 	engine/kevent.o \
 	engine/kfile.o \
@@ -84,6 +83,7 @@ MODULE_OBJS := \
 
 ifdef ENABLE_SCI32
 MODULE_OBJS += \
+	engine/hoyle5poker.o \
 	engine/kgraphics32.o \
 	graphics/celobj32.o \
 	graphics/controls32.o \