zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lunatic: "fix" building.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3130 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2012-11-08 20:17:19 +00:00
parent 2b0bbf4a1c
commit 17bac8cb55
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
polymer/eduke32/Makefile
View file

@ -2,6 +2,15 @@
# EDuke32 Makefile for GNU Make # 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 include Makefile.common
@ -13,9 +22,6 @@ else
#DXROOT=c:/sdks/directx/dx8 #DXROOT=c:/sdks/directx/dx8
endif endif
# Lunatic development, do not touch!
LUNATIC=0
# Build locations # Build locations
SRC=source SRC=source
RSRC=rsrc RSRC=rsrc
@ -170,14 +176,14 @@ ifneq (0,$(LUNATIC))
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
OURCOMMONFLAGS+= -I$(LUAJIT_WIN_SRC) OURCOMMONFLAGS+= -I$(LUAJIT_WIN_SRC)
else else
OURCOMMONFLAGS+= -I/usr/include/luajit-2.0 OURCOMMONFLAGS+= -I/usr/local/include/luajit-2.0
endif endif
OURCOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC OURCOMMONFLAGS+= -I$(SRC)/lunatic -DLUNATIC
ifeq ($(PLATFORM),WINDOWS) ifeq ($(PLATFORM),WINDOWS)
LIBS+= -LWindows/lib -lluajit LIBS+= -LWindows/lib -lluajit
else else
LIBS+= -L/usr/local/lib -lluajit-5.1 LIBS+= -lluajit-5.1
endif endif
EDITOROBJS+= $(OBJ)/lunatic_m32.$o EDITOROBJS+= $(OBJ)/lunatic_m32.$o

2
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -435,7 +435,7 @@ for i=0,6 do
local what = ffi.string(ffiC.g_sizes_of_what[i]) local what = ffi.string(ffiC.g_sizes_of_what[i])
local fsz = ffi.sizeof(what) local fsz = ffi.sizeof(what)
local csz = ffiC.g_sizes_of[i] 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 if (fsz ~= csz) then
good = false; good = false;
end end

3
polymer/eduke32/source/lunatic/defs_common.lua
View file

@ -1,6 +1,7 @@
-- This file contains LuaJIT definitions of stuff that's common to the game and -- 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 ffi = require("ffi")
local ffiC = ffi.C local ffiC = ffi.C