Fix devel plugins linking in linux

suokko · suokko · commit 0727403ac19b · 2018-06-30T21:12:42.000+03:00
diff --git a/library/include/modules/Screen.h b/library/include/modules/Screen.h
@@ -35,6 +35,7 @@ distribution.
 #include "DataDefs.h"
 #include "df/graphic.h"
 #include "df/viewscreen.h"
+#include "df/zoom_commands.h"
 
 #include "modules/GuiHooks.h"
 
@@ -182,6 +183,9 @@ namespace DFHack
             return rect2d(df::coord2d(0,0), getWindowSize()-df::coord2d(1,1));
         }
 
+        /// Wrapper to call enabler->zoom_display from plugins
+        DFHACK_EXPORT void zoom(df::zoom_commands cmd);
+
         /// Returns the state of [GRAPHICS:YES/NO]
         DFHACK_EXPORT bool inGraphicsMode();
 
diff --git a/library/modules/Screen.cpp b/library/modules/Screen.cpp
@@ -90,6 +90,10 @@ df::coord2d Screen::getWindowSize()
     return df::coord2d(gps->dimx, gps->dimy);
 }
 
+void Screen::zoom(df::zoom_commands cmd) {
+    enabler->zoom_display(cmd);
+}
+
 bool Screen::inGraphicsMode()
 {
     return init && init->display.flag.is_set(init_display_flags::USE_GRAPHICS);
diff --git a/plugins/devel/zoom.cpp b/plugins/devel/zoom.cpp
@@ -7,6 +7,7 @@
 #include <map>
 #include <vector>
 #include "modules/Gui.h"
+#include "modules/Screen.h"
 #include "modules/World.h"
 #include "df/enabler.h"
 
@@ -52,7 +53,7 @@ command_result df_zoom (color_ostream &out, std::vector <std::string> & paramete
         return CR_FAILURE;
     }
     df::zoom_commands cmd = zcmap[parameters[0]];
-    enabler->zoom_display(cmd);
+    Screen::zoom(cmd);
     if (cmd == df::zoom_commands::zoom_fullscreen)
         enabler->fullscreen = !enabler->fullscreen;
     return CR_OK;

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,10 @@ df::coord2d Screen::getWindowSize()`
`90`	`90`	`return df::coord2d(gps->dimx, gps->dimy);`
`91`	`91`	`}`
`92`	`92`
	`93`	`+void Screen::zoom(df::zoom_commands cmd) {`
	`94`	`+ enabler->zoom_display(cmd);`
	`95`	`+}`
	`96`	`+`
`93`	`97`	`bool Screen::inGraphicsMode()`
`94`	`98`	`{`
`95`	`99`	`return init && init->display.flag.is_set(init_display_flags::USE_GRAPHICS);`