From 07f8c442b91530002d117b72d3326ecddd65822c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 29 Apr 2010 00:10:39 +0200 Subject: [PATCH] Fix MSVC build of pydfhack, remove config.h (this is generated by cmake on build) --- dfhack/include/config.h | 7 ------- dfhack/python/DF_API.cpp | 2 ++ dfhack/python/DF_Buildings.cpp | 1 + dfhack/python/DF_Constructions.cpp | 1 + dfhack/python/DF_CreatureManager.cpp | 1 + dfhack/python/DF_GUI.cpp | 1 + dfhack/python/DF_Maps.cpp | 1 + dfhack/python/DF_Material.cpp | 1 + dfhack/python/DF_Position.cpp | 1 + dfhack/python/DF_Translate.cpp | 1 + dfhack/python/DF_Vegetation.cpp | 1 + 11 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 dfhack/include/config.h diff --git a/dfhack/include/config.h b/dfhack/include/config.h deleted file mode 100644 index a7de5f1c3..000000000 --- a/dfhack/include/config.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#define MEMXML_DATA_PATH . -#define HAVE_64_BIT - -#endif // CONFIG_H diff --git a/dfhack/python/DF_API.cpp b/dfhack/python/DF_API.cpp index 039d1b910..b705ef627 100644 --- a/dfhack/python/DF_API.cpp +++ b/dfhack/python/DF_API.cpp @@ -27,6 +27,8 @@ distribution. #include "Python.h" #include +#include "integers.h" + #include "DFTypes.h" #include "DFHackAPI.h" #include "DF_Imports.cpp" diff --git a/dfhack/python/DF_Buildings.cpp b/dfhack/python/DF_Buildings.cpp index 024b144f1..3bfaadd7a 100644 --- a/dfhack/python/DF_Buildings.cpp +++ b/dfhack/python/DF_Buildings.cpp @@ -28,6 +28,7 @@ distribution. #include "Python.h" #include #include +#include "integers.h" using namespace std; diff --git a/dfhack/python/DF_Constructions.cpp b/dfhack/python/DF_Constructions.cpp index 1f1f0ffb5..f54cb5e65 100644 --- a/dfhack/python/DF_Constructions.cpp +++ b/dfhack/python/DF_Constructions.cpp @@ -26,6 +26,7 @@ distribution. #define __DFCONSTRUCTIONS__ #include "Python.h" +#include "integers.h" #include "modules/Constructions.h" #include "DF_Helpers.cpp" diff --git a/dfhack/python/DF_CreatureManager.cpp b/dfhack/python/DF_CreatureManager.cpp index eb93e3629..166e67e2e 100644 --- a/dfhack/python/DF_CreatureManager.cpp +++ b/dfhack/python/DF_CreatureManager.cpp @@ -28,6 +28,7 @@ distribution. #include "Python.h" #include "stdio.h" #include +#include "integers.h" #include "DFTypes.h" #include "modules/Creatures.h" #include "DF_CreatureType.cpp" diff --git a/dfhack/python/DF_GUI.cpp b/dfhack/python/DF_GUI.cpp index 72661d50b..94bd3c5c8 100644 --- a/dfhack/python/DF_GUI.cpp +++ b/dfhack/python/DF_GUI.cpp @@ -26,6 +26,7 @@ distribution. #define __DFGUI__ #include "Python.h" +#include "integers.h" #include "DFTypes.h" #include "modules/Gui.h" diff --git a/dfhack/python/DF_Maps.cpp b/dfhack/python/DF_Maps.cpp index c9fb18a3f..03971c2ed 100644 --- a/dfhack/python/DF_Maps.cpp +++ b/dfhack/python/DF_Maps.cpp @@ -28,6 +28,7 @@ distribution. #include "Python.h" #include #include +#include "integers.h" using namespace std; diff --git a/dfhack/python/DF_Material.cpp b/dfhack/python/DF_Material.cpp index eac74a2ac..33ecf5b6a 100644 --- a/dfhack/python/DF_Material.cpp +++ b/dfhack/python/DF_Material.cpp @@ -27,6 +27,7 @@ distribution. #include "Python.h" #include +#include "integers.h" using namespace std; diff --git a/dfhack/python/DF_Position.cpp b/dfhack/python/DF_Position.cpp index 61ff2dad6..64f70065d 100644 --- a/dfhack/python/DF_Position.cpp +++ b/dfhack/python/DF_Position.cpp @@ -26,6 +26,7 @@ distribution. #define __DFPOSITION__ #include "Python.h" +#include "integers.h" #include "modules/Position.h" using namespace DFHack; diff --git a/dfhack/python/DF_Translate.cpp b/dfhack/python/DF_Translate.cpp index 0a64ceed6..ca570182b 100644 --- a/dfhack/python/DF_Translate.cpp +++ b/dfhack/python/DF_Translate.cpp @@ -28,6 +28,7 @@ distribution. #include "Python.h" #include #include +#include "integers.h" using namespace std; diff --git a/dfhack/python/DF_Vegetation.cpp b/dfhack/python/DF_Vegetation.cpp index 05468f817..ae8b6a016 100644 --- a/dfhack/python/DF_Vegetation.cpp +++ b/dfhack/python/DF_Vegetation.cpp @@ -26,6 +26,7 @@ distribution. #define __DFVEGETATION__ #include "Python.h" +#include "integers.h" #include "modules/Vegetation.h" #include "DF_Helpers.cpp"