diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/makefile | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/src/makefile b/src/makefile index 25b293c..868f98c 100644 --- a/src/makefile +++ b/src/makefile | |||
@@ -74,6 +74,13 @@ LUAPREFIX_mingw?=/usr | |||
74 | CDIR_mingw?=lua/$(LUAV) | 74 | CDIR_mingw?=lua/$(LUAV) |
75 | LDIR_mingw?=lua/$(LUAV)/lua | 75 | LDIR_mingw?=lua/$(LUAV)/lua |
76 | 76 | ||
77 | # where lua headers are found for ucrt64 builds | ||
78 | # LUAINC_ucrt64: | ||
79 | LUAINC_ucrt64?=/ucrt64/include | ||
80 | LUALIB_ucrt64?=/ucrt64/bin/lua$(subst .,,$(LUAV)).dll | ||
81 | LUAPREFIX_ucrt64?=/ucrt64 | ||
82 | CDIR_ucrt64?=lib/lua/$(LUAV) | ||
83 | LDIR_ucrt64?=share/lua/$(LUAV) | ||
77 | 84 | ||
78 | # LUAINC_win32: | 85 | # LUAINC_win32: |
79 | # LUALIB_win32: | 86 | # LUALIB_win32: |
@@ -153,7 +160,7 @@ print: | |||
153 | #------ | 160 | #------ |
154 | # Supported platforms | 161 | # Supported platforms |
155 | # | 162 | # |
156 | PLATS= macosx linux win32 win64 mingw solaris | 163 | PLATS= macosx linux win32 win64 mingw solaris ucrt64 |
157 | 164 | ||
158 | #------ | 165 | #------ |
159 | # Compiler and linker settings | 166 | # Compiler and linker settings |
@@ -219,6 +226,21 @@ LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o | |||
219 | LD_mingw=gcc | 226 | LD_mingw=gcc |
220 | SOCKET_mingw=wsocket.o | 227 | SOCKET_mingw=wsocket.o |
221 | 228 | ||
229 | #------ | ||
230 | # Compiler and linker settings | ||
231 | # for ucrt64 | ||
232 | SO_ucrt64=dll | ||
233 | O_ucrt64=o | ||
234 | CC_ucrt64=gcc | ||
235 | DEF_ucrt64= -DLUASOCKET_$(DEBUG) \ | ||
236 | -DWINVER=0x0501 | ||
237 | CFLAGS_ucrt64= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common | ||
238 | # \ | ||
239 | -fvisibility=hidden | ||
240 | LDFLAGS_ucrt64= $(LUALIB) -shared -Wl,-s -lws2_32 -o | ||
241 | LD_ucrt64=gcc | ||
242 | SOCKET_ucrt64=wsocket.o | ||
243 | |||
222 | 244 | ||
223 | #------ | 245 | #------ |
224 | # Compiler and linker settings | 246 | # Compiler and linker settings |
@@ -384,6 +406,9 @@ linux: | |||
384 | mingw: | 406 | mingw: |
385 | $(MAKE) all PLAT=mingw | 407 | $(MAKE) all PLAT=mingw |
386 | 408 | ||
409 | ucrt64: | ||
410 | $(MAKE) all PLAT=ucrt64 | ||
411 | |||
387 | solaris: | 412 | solaris: |
388 | $(MAKE) all-unix PLAT=solaris | 413 | $(MAKE) all-unix PLAT=solaris |
389 | 414 | ||