Bladeren bron

Added luwra to wrap lua.

Eiyeron Fulmincendii 9 jaren geleden
bovenliggende
commit
3ca11e39e7
4 gewijzigde bestanden met toevoegingen van 10 en 2 verwijderingen
  1. 3 0
      .gitmodules
  2. 2 2
      Makefile
  3. 1 0
      external/luwra
  4. 4 0
      external/rules.mk

+ 3 - 0
.gitmodules

@@ -4,3 +4,6 @@
 [submodule "external/lodepng"]
 	path = external/lodepng
 	url = https://github.com/lvandeve/lodepng.git
+[submodule "external/luwra"]
+	path = external/luwra
+	url = https://github.com/vapourismo/luwra.git

+ 2 - 2
Makefile

@@ -14,7 +14,7 @@ CFLAGS = $(CFLAGS_COMMON) -std=gnu11
 
 CPPFLAGS = $(CFLAGS_COMMON) -std=gnu++11
 
-LIBS = -lz
+LIBS = -lz -llua
 LDFLAGS = -flto
 
 SRCS_C :=
@@ -26,7 +26,7 @@ INCLUDE_EXT :=
 BUILT_SRCS :=
 BUILT_SRCS_C :=
 BUILT_SRCS_CPP :=
-DEPS := tinystl
+DEPS := tinystl luwra
 
 OUT = out/$(PLATFORM)
 ELF = $(OUT)/$(NAME).elf

+ 1 - 0
external/luwra

@@ -0,0 +1 @@
+Subproject commit fe1dcdb02840464b7b67cb665b1000a83208133e

+ 4 - 0
external/rules.mk

@@ -1,5 +1,9 @@
 external_LOCAL_PATH := $(call whereami)
 
+ifneq (, $(findstring luwra, $(DEPS)))
+    INCLUDE_EXT += $(external_LOCAL_PATH)/luwra/lib
+endif
+
 ifneq (, $(findstring tinystl, $(DEPS)))
     INCLUDE_EXT += $(external_LOCAL_PATH)/tinystl/include
 endif