1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
diff --git a/Makefile b/Makefile
index 4430b4e..1dddbef 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ LIBDIR=${DESTDIR}${PREFIX}/lib
CXX?=g++
CXXFLAGS+=-std=c++11 -Wall -Wextra -pedantic -O3 -Dexprtk_disable_caseinsensitivity
#CXXFLAGS=-std=c++11 -Wall -Wextra -Werror -pedantic -O3
-LDFLAGS+=-pthread
+LINK+=-pthread
ifeq ($(OS),Windows_NT)
detected_OS := Windows
@@ -22,7 +22,7 @@ ifeq ($(CXX),clang)
ifeq ($(OS),FreeBSD)
else
CXXFLAGS+= -Qunused-arguments -lstdc++
- LDFLAGS+= -lm
+ LINK+= -lm
endif
endif
@@ -71,66 +71,66 @@ ifeq ($(BUNDLED),0)
WAS_UNBUNDLED=1
ifneq ($(LUA_VERSION),)
CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
- LDFLAGS+= -LLua-5.3/src -llua
+ LINK+= -LLua-5.3/src -llua
else
CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
- LDFLAGS+= -LLuaJIT/src -llua51
+ LINK+= -LLuaJIT/src -llua51
endif
else ifeq ($(LUA_VERSION),x)
ifeq ($(detected_OS),FreeBSD) # FreeBSD
CXXFLAGS+= -D__LUA_VERSION_x__
- LDFLAGS+= -L/usr/local/lib -llua -lm -ldl
+ LINK+= -L/usr/local/lib -llua -lm -ldl
else # *nix
CXXFLAGS+= -D__LUA_VERSION_x__
- LDFLAGS+= -L/usr/local/lib -llua -ldl
+ LINK+= -L/usr/local/lib -llua -ldl
endif
else ifeq ($(LUA_VERSION),5.4)
ifeq ($(detected_OS),FreeBSD) # FreeBSD
CXXFLAGS+= -D__LUA_VERSION_5_4__
- LDFLAGS+= -L/usr/local/lib -llua-5.4 -lm -ldl
+ LINK+= -L/usr/local/lib -llua-5.4 -lm -ldl
else # *nix
CXXFLAGS+= -D__LUA_VERSION_5_4__
- LDFLAGS+= -L/usr/local/lib -llua-5.4 -ldl
+ LINK+= -L/usr/local/lib -llua-5.4 -ldl
endif
else ifeq ($(LUA_VERSION),5.3)
ifeq ($(detected_OS),FreeBSD) # FreeBSD
CXXFLAGS+= -D__LUA_VERSION_5_3__
- LDFLAGS+= -L/usr/local/lib -llua-5.3 -lm -ldl
+ LINK+= -L/usr/local/lib -llua-5.3 -lm -ldl
else # *nix
CXXFLAGS+= -D__LUA_VERSION_5_3__
- LDFLAGS+= -L/usr/local/lib -llua-5.3 -ldl
+ LINK+= -L/usr/local/lib -llua-5.3 -ldl
endif
else ifeq ($(LUA_VERSION),5.2)
ifeq ($(detected_OS),FreeBSD) # FreeBSD
CXXFLAGS+= -D__LUA_VERSION_5_2__
- LDFLAGS+= -L/usr/local/lib -llua-5.2 -lm -ldl
+ LINK+= -L/usr/local/lib -llua-5.2 -lm -ldl
else # *nix
CXXFLAGS+= -D__LUA_VERSION_5_2__
- LDFLAGS+= -L/usr/local/lib -llua-5.2 -ldl
+ LINK+= -L/usr/local/lib -llua-5.2 -ldl
endif
else ifeq ($(LUA_VERSION),5.1)
ifeq ($(detected_OS),FreeBSD) # FreeBSD
CXXFLAGS+= -D__LUA_VERSION_5_1__
- LDFLAGS+= -L/usr/local/lib -llua-5.1 -lm -ldl
+ LINK+= -L/usr/local/lib -llua-5.1 -lm -ldl
else # *nix
CXXFLAGS+= -D__LUA_VERSION_5_1__
- LDFLAGS+= -L/usr/local/lib -llua-5.1 -ldl
+ LINK+= -L/usr/local/lib -llua-5.1 -ldl
endif
else ifeq ($(LUAJIT_VERSION),2.0)
ifeq ($(detected_OS),FreeBSD) # FreeBSD
CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
+ LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
else # *nix
CXXFLAGS+= -D__LUAJIT_VERSION_2_0__
- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
+ LINK+= -ldl -L/usr/local/lib -lluajit-5.1
endif
else
ifeq ($(detected_OS),FreeBSD) # FreeBSD
CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
- LDFLAGS+= -ldl -lm -L/usr/local/lib -lluajit-5.1
+ LINK+= -ldl -lm -L/usr/local/lib -lluajit-5.1
else # *nix
CXXFLAGS+= -D__LUAJIT_VERSION_2_1__
- LDFLAGS+= -ldl -L/usr/local/lib -lluajit-5.1
+ LINK+= -ldl -L/usr/local/lib -lluajit-5.1
endif
endif
else
@@ -138,24 +138,24 @@ else
ifeq ($(LUA_VERSION),5.3)
CXXFLAGS+= -D__BUNDLED__ -D__LUA_VERSION_5_3__
ifeq ($(detected_OS),Windows) # Windows
- LDFLAGS+= -LLua-5.3/src -llua
- #LDFLAGS+= -LLua-5.3/src -llua
+ LINK+= -LLua-5.3/src -llua
+ #LINK+= -LLua-5.3/src -llua
else ifeq ($(detected_OS),FreeBSD) # FreeBSD
- LDFLAGS+= -LLua-5.3/src -llua -ldl -lm
+ LINK+= -LLua-5.3/src -llua -ldl -lm
else # *nix/Vercel
- LDFLAGS+= -LLua-5.3/src -llua -ldl
+ LINK+= -LLua-5.3/src -llua -ldl
endif
else
CXXFLAGS+= -D__BUNDLED__ -D__LUAJIT_VERSION_2_1__
ifeq ($(detected_OS),Windows) # Windows
- LDFLAGS+= -LLuaJIT/src -llua51
- #LDFLAGS+= -L. -llua51
+ LINK+= -LLuaJIT/src -llua51
+ #LINK+= -L. -llua51
else ifeq ($(detected_OS),FreeBSD) # FreeBSD
- LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl -lm
- #LDFLAGS+= -ldl -lm -LLuaJIT/src -lluajit
+ LINK+= ./LuaJIT/src/libluajit.a -ldl -lm
+ #LINK+= -ldl -lm -LLuaJIT/src -lluajit
else # *nix/Vercel
- LDFLAGS+= ./LuaJIT/src/libluajit.a -ldl
- #LDFLAGS+= -ldl -LLuaJIT/src -lluajit
+ LINK+= ./LuaJIT/src/libluajit.a -ldl
+ #LINK+= -ldl -LLuaJIT/src -lluajit
endif
endif
endif
@@ -220,10 +220,10 @@ HashTk.o: hashtk/HashTk.cpp hashtk/HashTk.h
nsm: $(objects)
ifeq ($(detected_OS),Windows) # Windows
- $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
+ $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
copy nsm.exe nift.exe
else
- $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LDFLAGS)
+ $(CXX) $(CXXFLAGS) $(objects) -o nsm $(LINK)
cp nsm nift
endif
|