small fixes

src/Jamrules

@@ -20,6 +20,16 @@ CCFLAGS += -Wwrite-strings
 		   -Wno-char-subscripts 
 		   ;
 
+rule UsingLuabind
+{
+   SubDirHdrs $(LUABIND_ROOT)/include ;
+}
+
+rule UsingLua
+{
+   SubDirHdrs $(LUA_ROOT)/include ;
+}
+
 rule TargetDirectory
 {
         # Now set up SEARCH_SOURCE, LOCATE_TARGET, SOURCE_GRIST

src/common/modules/museum.c

@@ -21,6 +21,7 @@
 #include <config.h>
 
 #include <eressea.h>
+#ifdef MUSEUM_MODULE
 #include "museum.h"
 
 /* kernel includes */
@@ -414,3 +415,4 @@ register_museum(void)
 	register_function((pf_generic)use_museumexitticket, "usemuseumexitticket");
 }
 
+#endif

src/eressea/Jamfile

@@ -15,6 +15,7 @@ if $(HAVE_LUA) {
 }
 
 if $(HAVE_LUA) {
+ BINARY = eressea-lua ;
  SOURCES =
   <lua>alliance.cpp
   <lua>building.cpp
@@ -29,13 +30,14 @@ if $(HAVE_LUA) {
  LINKLIBS on eressea += -llua50 -llualib50 ;
  LINKLIBS on eressea += -lluabind ;
 } else {
+ BINARY = eressea ;
  SOURCES = main.c ;
 }
 
 SOURCES += korrektur.c ;
 
-Main eressea : $(SOURCES) ;
+Main $(BINARY) : $(SOURCES) ;
-LinkLibraries eressea : 
+LinkLibraries $(BINARY) :
  kernel 
  gamecode 
  items 
@@ -47,4 +49,4 @@ LinkLibraries eressea :
  util
  ;
  
-LINKLIBS on eressea += -lm ;
+LINKLIBS on $(BINARY) += -lm ;

src/eressea/main.c

@@ -126,7 +126,7 @@ static int nowrite = 0;
 static boolean g_writemap = false;
 static boolean g_killeiswald = false;
 static boolean opt_reportonly = false;
-boolean opt_cr_absolute_coords = false;
+extern boolean opt_cr_absolute_coords;
 
 struct settings global = {
 	"Eressea", /* gamename */

src/lua.hpp

@@ -1,5 +1,5 @@
 extern "C" {
-#include "lua.h"
+#include <lua50/lua.h>
-#include "lauxlib.h"
+#include <lua50/lauxlib.h>
-#include "lualib.h"
+#include <lua50/lualib.h>
 }