Moving stuff around, part 3

library/APIPrivate.cpp

@@ -7,16 +7,16 @@
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Creatures.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
-#include "modules/Position.h"
+#include "dfhack/modules/Position.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
-#include "modules/Gui.h"
+#include "dfhack/modules/Gui.h"
-#include "modules/World.h"
+#include "dfhack/modules/World.h"
-#include "modules/Buildings.h"
+#include "dfhack/modules/Buildings.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
 
 using namespace DFHack;
 

library/CMakeLists.txt

@@ -64,7 +64,7 @@ SET(PROJECT_HDRS_LINUX
 )
 
 SET(PROJECT_HDRS_WINDOWS
-include/stdint_win.h
+include/dfhack/DFstdint_win.h
 )
 
 SET(PROJECT_SRCS_LINUX
@@ -133,19 +133,60 @@ IF(UNIX)
   install(FILES ${CMAKE_SOURCE_DIR}/output/Memory.xml DESTINATION share/dfhack)
 ENDIF(UNIX)
 
-# SWIG stuff is dead
+################################################################################
-# FIND_PACKAGE(SWIG)
+# DFCONNECT
-
+###
-#IF(SWIG_FOUND)
+
-#    INCLUDE(${SWIG_USE_FILE})
+SET(DFCONNECT_HDRS
-#    FIND_PACKAGE(PythonLibs)
+shm/shms.h
-#    IF(PYTHONLIBS_FOUND)
+shm/mod-core.h
-#        INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+shm/mod-maps.h
-#        SET(CMAKE_SWIG_FLAGS "-c++")
+)
-#        SET_SOURCE_FILES_PROPERTIES(pydfhack.i PROPERTIES CPLUSPLUS ON)
+
-#        SET(CMAKE_DFHACK_SWIG_OUTDIR ${dfhack_SOURCE_DIR}/output CACHE PATH "Directory where Java wrapped libraries will be saved.")
+SET(PROJECT_SRCS
-#        # SET_SOURCE_FILES_PROPERTIES(pydfhack.i PROPERTIES SWIG_FLAGS "-includeall")
+shm/mod-core.cpp
-#        SWIG_ADD_MODULE(pydfhack python pydfhack.i)
+shm/mod-maps.cpp
-#        SWIG_LINK_LIBRARIES(pydfhack ${PYTHON_LIBRARIES} dfhack)
+#mod-creature40d.cpp
-#    ENDIF(PYTHONLIBS_FOUND)
+)
-#ENDIF(SWIG_FOUND)
+
+SET(PROJECT_HDRS_LINUX
+)
+
+SET(PROJECT_HDRS_WINDOWS
+)
+
+SET(PROJECT_SRCS_LINUX
+shm/shms-linux.cpp
+)
+
+SET(PROJECT_SRCS_WINDOWS
+shm/shms-windows.cpp
+)
+
+IF(UNIX)
+    LIST(APPEND PROJECT_HDRS ${PROJECT_HDRS_LINUX})
+    LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_LINUX})
+ELSE(UNIX)
+    LIST(APPEND PROJECT_HDRS ${PROJECT_HDRS_WINDOWS})
+    LIST(APPEND PROJECT_SRCS ${PROJECT_SRCS_WINDOWS})
+ENDIF(UNIX)
+
+
+SET_SOURCE_FILES_PROPERTIES( ${PROJECT_HDRS} PROPERTIES HEADER_FILE_ONLY TRUE )
+
+LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
+
+#IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+    IF(UNIX)
+        add_definitions(-DLINUX_BUILD)
+        SET(PROJECT_LIBS rt)
+        SET(CMAKE_CXX_FLAGS "-fvisibility=hidden")
+        ADD_LIBRARY(dfconnect SHARED ${PROJECT_SRCS})
+        TARGET_LINK_LIBRARIES(dfconnect ${PROJECT_LIBS})
+    ELSE(UNIX)
+        #  SET(PROJECT_LIBS psapi)
+        ADD_LIBRARY(SDL SHARED ${PROJECT_SRCS})
+        TARGET_LINK_LIBRARIES(SDL ${PROJECT_LIBS})
+    ENDIF(UNIX)
+#ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+

library/DFContext.cpp

@@ -36,17 +36,17 @@ distribution.
 #include <mod-creature40d.h>
 #include "private/APIPrivate.h"
 
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Items.h"
-#include "modules/Position.h"
+#include "dfhack/modules/Position.h"
-#include "modules/Gui.h"
+#include "dfhack/modules/Gui.h"
-#include "modules/World.h"
+#include "dfhack/modules/World.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Creatures.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
-#include "modules/Buildings.h"
+#include "dfhack/modules/Buildings.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
 
 using namespace DFHack;
 

library/DFProcess-windows-SHM.cpp

@@ -21,11 +21,11 @@ must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source
 distribution.
 */
-#include "DFCommonInternal.h"
+#include "dfhack/DFCommonInternal.h"
-#include "DFProcess.h"
+#include "dfhack/DFProcess.h"
-#include "DFWindow.h"
+#include "dfhack/DFWindow.h"
-#include "DFMemInfo.h"
+#include "dfhack/DFMemInfo.h"
-#include "DFError.h"
+#include "dfhack/DFError.h"
 #include "shms.h"
 #include "mod-core.h"
 using namespace DFHack;

library/DFProcess-windows.cpp

@@ -21,11 +21,11 @@ must not be misrepresented as being the original software.
 3. This notice may not be removed or altered from any source
 distribution.
 */
-#include "DFCommonInternal.h"
+#include "dfhack/DFCommonInternal.h"
-#include "DFProcess.h"
+#include "dfhack/DFProcess.h"
-#include "DFWindow.h"
+#include "dfhack/DFWindow.h"
-#include "DFMemInfo.h"
+#include "dfhack/DFMemInfo.h"
-#include "DFError.h"
+#include "dfhack/DFError.h"
 using namespace DFHack;
 
 class NormalProcess::Private

library/DFProcessEnumerator-windows.cpp

@@ -22,11 +22,11 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "DFCommonInternal.h"
+#include "dfhack/DFCommonInternal.h"
-#include "DFProcessEnumerator.h"
+#include "dfhack/DFProcessEnumerator.h"
-#include "DFProcess.h"
+#include "dfhack/DFProcess.h"
-#include "DFMemInfo.h"
+#include "dfhack/DFMemInfo.h"
-#include "DFMemInfoManager.h"
+#include "dfhack/DFMemInfoManager.h"
 using namespace DFHack;
 
 class DFHack::ProcessEnumerator::Private

library/DFTypes_C.cpp

@@ -33,7 +33,7 @@ using namespace std;
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
 #include "dfhack-c/DFTypes_C.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 
 using namespace DFHack;
 

library/DFWindow-windows.cpp

@@ -22,9 +22,9 @@ must not be misrepresented as being the original software.
 distribution.
 */
 
-#include "DFCommonInternal.h"
+#include "dfhack/DFCommonInternal.h"
-#include "DFWindow.h"
+#include "dfhack/DFWindow.h"
-#include "DFProcess.h"
+#include "dfhack/DFProcess.h"
 using namespace DFHack;
 
 // should always reflect the enum in DFkeys.h

library/include/DFHack.h

@@ -12,16 +12,16 @@
 #include "dfhack/DFTypes.h"
 
 
-#include "modules/Buildings.h"
+#include "dfhack/modules/Buildings.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Position.h"
+#include "dfhack/modules/Position.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Creatures.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
-#include "modules/World.h"
+#include "dfhack/modules/World.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Items.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
 
 #include "dfhack/DFMiscUtils.h"
 #endif

library/include/dfhack-c/DFTypes_C.h

@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 
 using namespace DFHack;
 

library/include/dfhack-c/modules/Buildings_C.h

@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Buildings.h"
+#include "dfhack/modules/Buildings.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;

library/include/dfhack-c/modules/Constructions_C.h

@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;

library/include/dfhack-c/modules/Creatures_C.h

@@ -29,8 +29,8 @@ distribution.
 #include "dfhack/DFIntegers.h"
 #include "DFHack_C.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Creatures.h"
 
 using namespace DFHack;
 

library/include/dfhack-c/modules/Items_C.h

@@ -32,7 +32,7 @@ distribution.
 using namespace DFHack;
 
 #include "dfhack/DFTypes.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Items.h"
 #include "DFHack_C.h"
 
 #ifdef __cplusplus

library/include/dfhack-c/modules/Maps_C.h

@@ -34,7 +34,7 @@ distribution.
 using namespace std;
 
 #include "dfhack/DFTypes.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;

library/include/dfhack-c/modules/Materials_C.h

@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 #include "DFHack_C.h"
 #include "dfhack-c/DFTypes_C.h"
 

library/include/dfhack-c/modules/Translation_C.h

@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;

library/include/dfhack-c/modules/Vegetation_C.h

@@ -28,7 +28,7 @@ distribution.
 #include "dfhack/DFExport.h"
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;

library/include/dfhack/DFIntegers.h

@@ -11,6 +11,6 @@ You can turn off the include by defining SKIP_DFHACK_STDINT
     #ifndef _MSC_VER
         #include <stdint.h>
     #else
-        #include "stdint_win.h"
+        #include "DFstdint_win.h"
     #endif
 #endif

library/modules/Buildings.cpp

@@ -24,12 +24,13 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Buildings.h"
+//#include "dfhack/modules/Translation.h"
+#include "dfhack/modules/Buildings.h"
 
 using namespace DFHack;
 

library/modules/Buildings_C.cpp

@@ -31,8 +31,8 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Buildings.h"
+#include "dfhack/modules/Buildings.h"
-#include "modules/Buildings_C.h"
+#include "dfhack-c/modules/Buildings_C.h"
 
 using namespace DFHack;
 

library/modules/Constructions.cpp

@@ -24,12 +24,12 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+//#include "modules/Translation.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
 
 using namespace DFHack;
 

library/modules/Constructions_C.cpp

@@ -26,8 +26,8 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Constructions.h"
+#include "dfhack/modules/Constructions.h"
-#include "modules/Constructions_C.h"
+#include "dfhack-c/modules/Constructions_C.h"
 
 using namespace DFHack;
 

library/modules/Creatures.cpp

@@ -35,8 +35,8 @@ distribution.
 #include <shms.h>
 #include <mod-core.h>
 #include <mod-creature2010.h>
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Creatures.h"
 
 
 #define SHMCREATURESHDR ((Creatures2010::shm_creature_hdr *)d->d->shm_start)

library/modules/Creatures_C.cpp

@@ -31,9 +31,9 @@ distribution.
 using namespace std;
 
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Creatures.h"
+#include "dfhack/modules/Creatures.h"
-#include "modules/Creatures_C.h"
+#include "dfhack-c/modules/Creatures_C.h"
 #include "DFHack_C.h"
 
 using namespace DFHack;

library/modules/Gui.cpp

@@ -24,7 +24,7 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Gui.h"
+#include "dfhack/modules/Gui.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFTypes.h"

library/modules/Gui_C.cpp

@@ -24,11 +24,11 @@ distribution.
 #include <vector>
 #include <string>
 #include "DFHack_C.h"
-#include "modules/Gui_C.h"
+#include "dfhack-c/modules/Gui_C.h"
 #include "dfhack/DFIntegers.h"
 
 #include "dfhack/DFCommonInternal.h"
-#include "modules/Gui.h"
+#include "dfhack/modules/Gui.h"
 
 using namespace DFHack;
 

library/modules/Items.cpp

@@ -28,8 +28,8 @@ distribution.
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Items.h"
 
 using namespace DFHack;
 

library/modules/Items_C.cpp

@@ -35,10 +35,10 @@ using namespace std;
 using namespace DFHack;
 
 #include "dfhack/DFProcess.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
-#include "modules/Items.h"
+#include "dfhack/modules/Items.h"
 #include "dfhack-c/DFTypes_C.h"
-#include "modules/Items_C.h"
+#include "dfhack-c/modules/Items_C.h"
 
 
 #ifdef __cplusplus

library/modules/Maps.cpp

@@ -27,7 +27,7 @@ distribution.
 #include <mod-core.h>
 #include <mod-maps.h>
 #include "../private/APIPrivate.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
 #include "dfhack/DFError.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"

library/modules/Maps_C.cpp

@@ -31,8 +31,8 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Maps.h"
+#include "dfhack/modules/Maps.h"
-#include "modules/Maps_C.h"
+#include "dfhack-c/modules/Maps_C.h"
 
 using namespace DFHack;
 

library/modules/Materials.cpp

@@ -25,7 +25,7 @@ distribution.
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"

library/modules/Materials_C.cpp

@@ -31,9 +31,9 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Materials.h"
+#include "dfhack/modules/Materials.h"
 #include "dfhack-c/DFTypes_C.h"
-#include "modules/Materials_C.h"
+#include "dfhack-c/modules/Materials_C.h"
 
 using namespace DFHack;
 

library/modules/Position.cpp

@@ -24,7 +24,7 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Position.h"
+#include "dfhack/modules/Position.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 using namespace DFHack;

library/modules/Position_C.cpp

@@ -24,11 +24,11 @@ distribution.
 
 #include <vector>
 #include <string>
-#include "modules/Position_C.h"
+#include "dfhack-c/modules/Position_C.h"
 #include "dfhack/DFIntegers.h"
 
 #include "dfhack/DFCommonInternal.h"
-#include "modules/Position.h"
+#include "dfhack/modules/Position.h"
 
 using namespace DFHack;
 

library/modules/Translation.cpp

@@ -24,12 +24,11 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Translation.h"
 
 using namespace DFHack;
 

library/modules/Translation_C.cpp

@@ -29,8 +29,8 @@ using namespace std;
 
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Translation.h"
+#include "dfhack/modules/Translation.h"
-#include "modules/Translation_C.h"
+#include "dfhack-c/modules/Translation_C.h"
 
 using namespace DFHack;
 

library/modules/Vegetation.cpp

@@ -24,12 +24,13 @@ distribution.
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/Translation.h"
+
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFVector.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
+#include "dfhack/modules/Translation.h"
 
 using namespace DFHack;
 

library/modules/Vegetation_C.cpp

@@ -25,8 +25,8 @@ distribution.
 #include "dfhack/DFIntegers.h"
 #include "dfhack/DFCommonInternal.h"
 #include "dfhack/DFTypes.h"
-#include "modules/Vegetation.h"
+#include "dfhack/modules/Vegetation.h"
-#include "modules/Vegetation_C.h"
+#include "dfhack-c/modules/Vegetation_C.h"
 
 using namespace DFHack;
 

library/modules/World.cpp

@@ -36,7 +36,7 @@ FIXME: Japa said that he had to do this with the time stuff he got from here
 
 #include "dfhack/DFCommonInternal.h"
 #include "../private/APIPrivate.h"
-#include "modules/World.h"
+#include "dfhack/modules/World.h"
 #include "dfhack/DFProcess.h"
 #include "dfhack/DFMemInfo.h"
 #include "dfhack/DFTypes.h"

library/shm/mod-core.cpp

@@ -27,7 +27,7 @@ distribution.
  */
 
 #include <stdio.h>
-#include "../include/DFIntegers.h"
+#include "dfhack/DFIntegers.h"
 #include <stdlib.h>
 #include <string.h>
 #include <string>

library/shm/mod-maps.cpp

@@ -1,13 +1,13 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <DFIntegers.h>
+#include <dfhack/DFIntegers.h>
 
 #include "shms.h"
 #include "mod-core.h"
 #include "mod-maps.h"
-#include <DFTypes.h>
+#include <dfhack/DFTypes.h>
-#include <modules/Maps.h>
+#include <dfhack/modules/Maps.h>
 using namespace DFHack;
 using namespace DFHack::Server::Maps;
 

library/shm/shms-windows.cpp

@@ -33,7 +33,7 @@ distribution.
 
 #define DFhackCExport extern "C" __declspec(dllexport)
 
-#include "../include/DFIntegers.h"
+#include "dfhack/DFIntegers.h"
 #include <vector>
 #include <string>
 #include "shms.h"