Merge branch 'cleanups' of https://github.com/plaes/dfhack

CMakeLists.txt

@@ -94,9 +94,11 @@ INCLUDE_DIRECTORIES ( library/depends/protobuf/ )
 # use shared libraries for protobuf
 ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
 
-# build the static lua for dfusion
+IF(!UNIX)
-INCLUDE_DIRECTORIES ( lua/include )
+    # build the static lua for dfusion, win32 only
-add_subdirectory (lua)
+    INCLUDE_DIRECTORIES ( lua/include )
+    add_subdirectory (lua)
+ENDIF()
 
 # build the lib itself
 IF(BUILD_LIBRARY)

library/Core.cpp

@@ -62,7 +62,6 @@ using namespace DFHack;
 #include <stdlib.h>
 #include <fstream>
 #include "tinythread.h"
-#include <llex.h>
 
 using namespace tthread;
 using namespace df::enums;

pdcurses/panel.h

@@ -1,58 +0,0 @@
-/* Public Domain Curses */
-
-/* $Id: panel.h,v 1.19 2008/07/13 16:08:16 wmcbrine Exp $ */
-
-/*----------------------------------------------------------------------*
- *                         Panels for PDCurses                          *
- *----------------------------------------------------------------------*/
-
-#ifndef __PDCURSES_PANEL_H__
-#define __PDCURSES_PANEL_H__ 1
-
-#include <curses.h>
-
-#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
-extern "C"
-{
-#endif
-
-typedef struct panelobs
-{
-    struct panelobs *above;
-    struct panel *pan;
-} PANELOBS;
-
-typedef struct panel
-{
-    WINDOW *win;
-    int wstarty;
-    int wendy;
-    int wstartx;
-    int wendx;
-    struct panel *below;
-    struct panel *above;
-    const void *user;
-    struct panelobs *obscure;
-} PANEL;
-
-int     bottom_panel(PANEL *pan);
-int     del_panel(PANEL *pan);
-int     hide_panel(PANEL *pan);
-int     move_panel(PANEL *pan, int starty, int startx);
-PANEL  *new_panel(WINDOW *win);
-PANEL  *panel_above(const PANEL *pan);
-PANEL  *panel_below(const PANEL *pan);
-int     panel_hidden(const PANEL *pan);
-const void *panel_userptr(const PANEL *pan);
-WINDOW *panel_window(const PANEL *pan);
-int     replace_panel(PANEL *pan, WINDOW *win);
-int     set_panel_userptr(PANEL *pan, const void *uptr);
-int     show_panel(PANEL *pan);
-int     top_panel(PANEL *pan);
-void    update_panels(void);
-
-#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)
-}
-#endif
-
-#endif /* __PDCURSES_PANEL_H__ */