Bladeren bron

Adjust make paths.

scossu 1 week geleden
bovenliggende
commit
d8e9ed52cd
2 gewijzigde bestanden met toevoegingen van 3 en 3 verwijderingen
  1. 2 2
      Makefile
  2. 1 1
      ext/volksdata

+ 2 - 2
Makefile

@@ -12,7 +12,7 @@ VOLK_ROOT = ext/volksdata
 VOLK_LIBDIR = $(VOLK_ROOT)/build
 
 INCLUDE = -I$(PREFIX)/include
-VOLK_INCLUDE = -I$(VOLK_ROOT)/include
+VOLK_INCLUDE = -I$(VOLK_LIBDIR)/include
 CFLAGS = -shared -Wall -Wextra -fPIC
 ifeq ($(DEBUG), 1)
 CFLAGS += -DDEBUG -Og -ggdb
@@ -50,7 +50,7 @@ $(VOLK_LIB):
 	$(MAKE) -C $(VOLK_ROOT) lib LOCAL=1 DEBUG=$(DEBUG) LOCAL_PREFIX=$(VOLK_ROOT)
 
 $(OBJPATH): src/*.c src/lua_volksdata.h
-	$(CC) $(INCLUDE) $(CFLAGS) $(LDFLAGS) -o $@ src/*.c $(VOLK_LIB)
+	$(CC) $(INCLUDE) $(VOLK_INCLUDE) $(CFLAGS) $(LDFLAGS) -o $@ src/*.c $(VOLK_LIB)
 
 
 install: lib

+ 1 - 1
ext/volksdata

@@ -1 +1 @@
-Subproject commit c37110fba218d23c489ddd74f9e35776595cc293
+Subproject commit 98fad894222013e529d9642359e48a68aa54f9d7