artxd/zapret2
1
0 Fork 0
mirror of https://github.com/bol-van/zapret2.git synced 2026-10-29 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

makefile fixes

Browse Source
This commit is contained in:
bol-van committed 2026-01-14 17:08:35 +03:00
1 parent d3199eebd3
commit 72a269e88d
3 files changed
+9 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/compile/build_howto_unix.txt
+1
View File
@@ -5,6 +5,7 @@ make -C /opt/zapret2 systemd
FreeBSD : FreeBSD :
pkg install pkgconf
pkg search luajit-2 pkg search luajit-2
# see what's the version available # see what's the version available
pkg install luajit-2.1.0.20250728 pkg install luajit-2.1.0.20250728
nfq2/BSDmakefile
+3 -2
View File
@@ -1,4 +1,5 @@
CC ?= cc CC ?= cc
PKG_CONFIG ?= pkg-config
OPTIMIZE ?= -Os OPTIMIZE ?= -Os
CFLAGS += -std=gnu99 -s $(OPTIMIZE) -flto=auto -Wno-address-of-packed-member CFLAGS += -std=gnu99 -s $(OPTIMIZE) -flto=auto -Wno-address-of-packed-member
LIBS = -lz -lm LIBS = -lz -lm
@@ -26,8 +27,8 @@ OSNAME!=uname
.endif .endif
LUA_LIB!= pkg-config --libs $(LUA_PKG) LUA_LIB!= $(PKG_CONFIG) --libs $(LUA_PKG)
LUA_CFLAGS!= pkg-config --cflags $(LUA_PKG) LUA_CFLAGS!= $(PKG_CONFIG) --cflags $(LUA_PKG)
.if "${LUA_JIT}" == "1" .if "${LUA_JIT}" == "1"
LUA_CFLAGS+=-DLUAJIT LUA_CFLAGS+=-DLUAJIT
nfq2/Makefile
+5 -5
View File
@@ -1,4 +1,5 @@
CC ?= cc CC ?= cc
PKG_CONFIG ?= pkg-config
OPTIMIZE ?= -Os OPTIMIZE ?= -Os
CFLAGS += -std=gnu99 $(OPTIMIZE) -flto=auto CFLAGS += -std=gnu99 $(OPTIMIZE) -flto=auto
CFLAGS_SYSTEMD = -DUSE_SYSTEMD CFLAGS_SYSTEMD = -DUSE_SYSTEMD
@@ -16,7 +17,6 @@ RES_CYGWIN32 = windows/res/32/winmanifest.o windows/res/32/winicon.o
RES_CYGWIN64 = windows/res/64/winmanifest.o windows/res/64/winicon.o RES_CYGWIN64 = windows/res/64/winmanifest.o windows/res/64/winicon.o
SRC_FILES = *.c crypto/*.c SRC_FILES = *.c crypto/*.c
LUA_JIT?=1 LUA_JIT?=1
ifeq ($(LUA_JIT),1) ifeq ($(LUA_JIT),1)
@@ -29,13 +29,13 @@ $(info trying luajit $(LUAJIT_VER) lua $(LUAJIT_LUA_VER))
LUA_LIB_NAME= LUA_LIB_NAME=
ifeq ($(LUA_CFLAGS),) ifeq ($(LUA_CFLAGS),)
LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKG) 2>/dev/null) LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKG) 2>/dev/null)
ifeq ($(LUA_CFLAGS),) ifeq ($(LUA_CFLAGS),)
LUA_CFLAGS := -I/usr/local/include/luajit-$(LUAJIT_VER) -I/usr/include/luajit-$(LUAJIT_VER) LUA_CFLAGS := -I/usr/local/include/luajit-$(LUAJIT_VER) -I/usr/include/luajit-$(LUAJIT_VER)
endif endif
endif endif
ifeq ($(LUA_LIB),) ifeq ($(LUA_LIB),)
LUA_LIB := $(shell pkg-config --libs $(LUA_PKG) 2>/dev/null) LUA_LIB := $(shell $(PKG_CONFIG) --libs $(LUA_PKG) 2>/dev/null)
LUA_LIB_DIR := LUA_LIB_DIR :=
ifeq ($(LUA_LIB),) ifeq ($(LUA_LIB),)
@@ -87,13 +87,13 @@ else
endif endif
ifeq ($(LUA_CFLAGS),) ifeq ($(LUA_CFLAGS),)
LUA_CFLAGS := $(shell pkg-config --cflags $(LUA_PKG) 2>/dev/null) LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKG) 2>/dev/null)
ifeq ($(LUA_CFLAGS),) ifeq ($(LUA_CFLAGS),)
LUA_CFLAGS := -I/usr/local/include/lua$(LUA_VER) -I/usr/local/include/lua-$(LUA_VER) -I/usr/include/lua$(LUA_VER) -I/usr/include/lua-$(LUA_VER) LUA_CFLAGS := -I/usr/local/include/lua$(LUA_VER) -I/usr/local/include/lua-$(LUA_VER) -I/usr/include/lua$(LUA_VER) -I/usr/include/lua-$(LUA_VER)
endif endif
endif endif
ifeq ($(LUA_LIB),) ifeq ($(LUA_LIB),)
LUA_LIB := $(shell pkg-config --libs $(LUA_PKG) 2>/dev/null) LUA_LIB := $(shell $(PKG_CONFIG) --libs $(LUA_PKG) 2>/dev/null)
LUA_LIB_DIR := LUA_LIB_DIR :=
ifeq ($(LUA_LIB),) ifeq ($(LUA_LIB),)
ifneq ($(wildcard /usr/local/lib/liblua-$(LUA_VER).*),) ifneq ($(wildcard /usr/local/lib/liblua-$(LUA_VER).*),)