Code compiles, except for the dm.stimresponse module

codereader · Feb 4, 2017 · 0f6adb5 · 0f6adb5
1 parent de00ea5
commit 0f6adb5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/configure.ac b/configure.ac
@@ -53,7 +53,7 @@ AC_ARG_ENABLE([python],
 if [[ "$darkmod_plugins" != 'no' ]]
 then
     # Enable conditional directories (used by plugins/Makefile.am)
-    sr_plugin="dm.stimresponse"
+    #sr_plugin="dm.stimresponse"
     obj_plugin="dm.objectives"
     difficulty_plugin="dm.difficulty"
     conv_plugin="dm.conversation"

diff --git a/include/iscript.h b/include/iscript.h
@@ -1,10 +1,7 @@
-#ifndef ISCRIPT_H_
-#define ISCRIPT_H_
+#pragma once
 
 #include "imodule.h"
-
-// Forward decl.
-namespace boost { namespace python { class object; } }
+#include <boost/python/object_fwd.hpp>
 
 namespace script
 {
@@ -76,5 +73,3 @@ inline IScriptingSystem& GlobalScriptingSystem() {
 	);
 	return _scriptingSystem;
 }
-
-#endif /*ISCRIPT_H_*/
diff --git a/plugins/dm.objectives/Makefile.am b/plugins/dm.objectives/Makefile.am
@@ -6,7 +6,7 @@ plugins_LTLIBRARIES = dm_objectives.la
 
 dm_objectives_la_LIBADD = $(top_builddir)/libs/wxutil/libwxutil.la \
                           $(top_builddir)/libs/xmlutil/libxmlutil.la
-dm_objectives_la_LDFLAGS = -module -avoid-version -Wl,-z,defs \
+dm_objectives_la_LDFLAGS = -module -avoid-version \
                            $(BOOST_REGEX_LIBS) $(WX_LIBS) $(XML_LIBS)
 dm_objectives_la_SOURCES = ObjectivesEditor.cpp \
                      objectives.cpp \

diff --git a/plugins/dm.objectives/ce/specpanel/SpecifierPanel.h b/plugins/dm.objectives/ce/specpanel/SpecifierPanel.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <functional>
 #include <memory>
 
 class wxWindow;