Lunatic: "fix" building.

git-svn-id: https://svn.eduke32.com/eduke32@3130 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/Makefile

@@ -2,6 +2,15 @@
 # EDuke32 Makefile for GNU Make
 #
 
+# Lunatic development, do not touch!
+LUNATIC=0
+ifneq ($(LUNATIC),0)
+    # FIXME: Lunatic doesn't build with inlining because of wacky include
+    # chains!
+    override DISABLEINLINING=1
+endif
+
+
 include Makefile.common
 
 
@@ -13,9 +22,6 @@ else
     #DXROOT=c:/sdks/directx/dx8
 endif
 
-# Lunatic development, do not touch!
-LUNATIC=0
-
 # Build locations
 SRC=source
 RSRC=rsrc
@@ -170,14 +176,14 @@ ifneq (0,$(LUNATIC))
     ifeq ($(PLATFORM),WINDOWS)
         OURCOMMONFLAGS+= -I$(LUAJIT_WIN_SRC)
     else
-        OURCOMMONFLAGS+= -I/usr/include/luajit-2.0
+        OURCOMMONFLAGS+= -I/usr/local/include/luajit-2.0
     endif
     OURCOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC
 
     ifeq ($(PLATFORM),WINDOWS)
         LIBS+= -LWindows/lib -lluajit
     else
-        LIBS+= -L/usr/local/lib -lluajit-5.1
+        LIBS+= -lluajit-5.1
     endif
 
     EDITOROBJS+= $(OBJ)/lunatic_m32.$o

polymer/eduke32/source/lunatic/defs.ilua

@@ -435,7 +435,7 @@ for i=0,6 do
     local what = ffi.string(ffiC.g_sizes_of_what[i])
     local fsz = ffi.sizeof(what)
     local csz = ffiC.g_sizes_of[i]
-    print(i..": "..what..": C sizeof = "..tostring(csz)..", FFI sizeof = "..tostring(fsz))
+--    print(i..": "..what..": C sizeof = "..tostring(csz)..", FFI sizeof = "..tostring(fsz))
     if (fsz ~= csz) then
         good = false;
     end

polymer/eduke32/source/lunatic/defs_common.lua

@@ -1,6 +1,7 @@
 
 -- This file contains LuaJIT definitions of stuff that's common to the game and
--- editor.  The 'decl' is expected to be defined in the global environment.
+-- editor.  The 'decl' function is expected to be defined in the global
+-- environment.
 
 local ffi = require("ffi")
 local ffiC = ffi.C