m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIN32 Cross build now includes lua

Browse Source
This commit is contained in:
Thomas Bernard 2018-02-21 01:20:44 +01:00
parent 8ec19f523b
commit c29a52a4b2
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
3rdparty/Makefile vendored
View File

@ -23,6 +23,9 @@ ZLIBURL=https://www.zlib.net/$(ZLIBARCH)
FREETYPE=freetype-2.9 FREETYPE=freetype-2.9
FREETYPEARCH=$(FREETYPE).tar.gz FREETYPEARCH=$(FREETYPE).tar.gz
FREETYPEURL=https://download.savannah.gnu.org/releases/freetype/$(FREETYPEARCH) FREETYPEURL=https://download.savannah.gnu.org/releases/freetype/$(FREETYPEARCH)
LUA=lua-5.3.4
LUAARCH=$(LUA).tar.gz
LUAURL=https://www.lua.org/ftp/$(LUAARCH)
# https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.6.1.tar.gz # https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-0.6.1.tar.gz
PREFIX = $(PWD)/usr PREFIX = $(PWD)/usr
@ -49,19 +52,20 @@ endif
HOST = $(shell $(CC) -dumpmachine) HOST = $(shell $(CC) -dumpmachine)
#HOST = i686-pc-mingw32 #HOST = i686-pc-mingw32
.PHONY: all clean clean_archives clean_all libs libpng libsdl libsdl_image libsdl_ttf libjpeg libtiff zlib freetype .PHONY: all clean clean_archives clean_all libs libpng libsdl libsdl_image libsdl_ttf libjpeg libtiff zlib freetype lua
all: libs all: libs
clean_all: clean clean_archives clean_all: clean clean_archives
clean: clean:
$(RM) -r usr/ $(LIBPNG) $(ZLIB) $(SDLIMAGE) $(SDLTTF) $(JPEGDIR) $(LIBTIFF) $(FREETYPE) SDL-1.2.15 $(RM) -r usr/ $(LIBPNG) $(ZLIB) $(SDLIMAGE) $(JPEGDIR) $(LIBTIFF)
$(RM) -r $(SDLTTF) $(FREETYPE) SDL-1.2.15 $(LUA)
clean_archives: clean_archives:
$(RM) -r archives $(RM) -r archives
libs: libpng libsdl libsdl_image libsdl_ttf libs: libpng libsdl libsdl_image libsdl_ttf lua
libsdl: $(PREFIX)/lib/libSDLmain.a libsdl: $(PREFIX)/lib/libSDLmain.a
libsdl_image: $(PREFIX)/lib/libSDL_image.a libsdl_image: $(PREFIX)/lib/libSDL_image.a
libsdl_ttf: $(PREFIX)/lib/libSDL_ttf.a libsdl_ttf: $(PREFIX)/lib/libSDL_ttf.a
@ -70,6 +74,18 @@ libpng: $(PREFIX)/lib/libpng.a
libtiff: $(PREFIX)/lib/libtiff.a libtiff: $(PREFIX)/lib/libtiff.a
zlib: $(PREFIX)/lib/libz.a zlib: $(PREFIX)/lib/libz.a
freetype: $(PREFIX)/lib/libfreetype.a freetype: $(PREFIX)/lib/libfreetype.a
lua: $(PREFIX)/lib/liblua.a
$(PREFIX)/lib/liblua.a: $(LUA)/.ok
ifdef WIN32CROSS
cd $(LUA) && $(MAKE) PLAT=mingw CC=$(CC) RANLIB=$(RANLIB)
cd $(LUA) && $(MAKE) install PLAT=mingw INSTALL_TOP=$(PREFIX) TO_BIN="lua.exe luac.exe"
cp -v $(LUA)/src/lua*.dll ../bin
endif
$(LUA)/.ok: archives/$(LUAARCH)
$(TAR) xzf $<
touch $@
$(PREFIX)/lib/libSDLmain.a: archives/$(SDLDEVEL) $(PREFIX)/lib/libSDLmain.a: archives/$(SDLDEVEL)
$(TAR) xzf $< $(TAR) xzf $<
@ -207,3 +223,7 @@ archives/$(ZLIBARCH):
archives/$(FREETYPEARCH): archives/$(FREETYPEARCH):
@$(MKDIR) $(@D) @$(MKDIR) $(@D)
cd $(@D) && $(GETURL) $(FREETYPEURL) cd $(@D) && $(GETURL) $(FREETYPEURL)
archives/$(LUAARCH):
@$(MKDIR) $(@D)
cd $(@D) && $(GETURL) $(LUAURL)

3
src/Makefile
View File

@ -376,6 +376,9 @@ endif
COPT += $(shell PKG_CONFIG_LIBDIR=$(CROSS_PKG_CONFIG_PATH) $(CROSS_PKGCONFIG) --cflags libpng || echo "-D__no_pnglib__" ) COPT += $(shell PKG_CONFIG_LIBDIR=$(CROSS_PKG_CONFIG_PATH) $(CROSS_PKGCONFIG) --cflags libpng || echo "-D__no_pnglib__" )
LOPT += $(shell PKG_CONFIG_LIBDIR=$(CROSS_PKG_CONFIG_PATH) $(CROSS_PKGCONFIG) --libs libpng) LOPT += $(shell PKG_CONFIG_LIBDIR=$(CROSS_PKG_CONFIG_PATH) $(CROSS_PKGCONFIG) --libs libpng)
endif endif
LUALOPT = -llua
COPT += $(LUACOPT)
LOPT += $(LUALOPT)
OBJDIR = ../obj/win32 OBJDIR = ../obj/win32
PLATFORM = win32 PLATFORM = win32
PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS) PLATFORMFILES = bin/SDL.dll bin/SDL_image.dll $(wildcard ../bin/libpng*.dll) $(wildcard ../bin/libjpeg*.dll) bin/zlib1.dll $(TTFLIBS)