aboutsummaryrefslogtreecommitdiff
path: root/src/makefile
diff options
context:
space:
mode:
authorDiego Nehab <diego@impa.br>2012-12-11 17:43:49 -0200
committerDiego Nehab <diego@impa.br>2012-12-11 17:43:49 -0200
commit72a5347f97b3f158431d4181109db3086a8a2953 (patch)
tree530f7ab086627154fc8693c939145c6d815de6df /src/makefile
parent618ce43ee3950b80aca1fde0a5b12e6e13627f1b (diff)
downloadluasocket-72a5347f97b3f158431d4181109db3086a8a2953.tar.gz
luasocket-72a5347f97b3f158431d4181109db3086a8a2953.tar.bz2
luasocket-72a5347f97b3f158431d4181109db3086a8a2953.zip
Remove warnings and fix makefile for Win32.
Diffstat (limited to 'src/makefile')
-rw-r--r--src/makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/makefile b/src/makefile
index 42b745e..a75d5a6 100644
--- a/src/makefile
+++ b/src/makefile
@@ -114,7 +114,7 @@ SOCKET_macosx=usocket.o
114SO_linux=so 114SO_linux=so
115O_linux=o 115O_linux=o
116CC_linux=gcc 116CC_linux=gcc
117DEF_linux=-DLUASOCKET_$(DEBUG) \ 117DEF_linux=-DLUASOCKET_$(DEBUG) -DLUA_COMPAT_MODULE \
118 -DLUASOCKET_API='__attribute__((visibility("default")))' \ 118 -DLUASOCKET_API='__attribute__((visibility("default")))' \
119 -DMIME_API='__attribute__((visibility("default")))' 119 -DMIME_API='__attribute__((visibility("default")))'
120CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra -Wimplicit -O2 -ggdb3 -fpic \ 120CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra -Wimplicit -O2 -ggdb3 -fpic \
@@ -130,11 +130,12 @@ SO_win32=dll
130O_win32=obj 130O_win32=obj
131CC_win32=cl 131CC_win32=cl
132DEF_win32= /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" \ 132DEF_win32= /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" \
133 /D "LUASOCKET_API=__declspec(dllexport)" /D "LUASOCKET_$(DEBUG)" \ 133 /D "LUASOCKET_API=__declspec(dllexport)" /D "_CRT_SECURE_NO_WARNINGS" \
134 /D "_CRT_SECURE_NO_WARNINGS" /D "_WINDLL" 134 /D "_WINDLL" /D "LUA_COMPAT_MODULE" /D "MIME_API=__declspec(dllexport)" \
135CFLAGS_win32=/I$(LUAINC) $(DEF) /O2 /Ot /MD /W3 /nologo 135 /D "LUASOCKET_$(DEBUG)"
136CFLAGS_win32=/I "$(LUAINC)" $(DEF) /O2 /Ot /MD /W3 /nologo
136LDFLAGS_win32= /nologo /link /NOLOGO /DLL /INCREMENTAL:NO \ 137LDFLAGS_win32= /nologo /link /NOLOGO /DLL /INCREMENTAL:NO \
137 /LIBPATH:$(LUALIB) \ 138 /LIBPATH:"$(LUALIB)" \
138 /MANIFEST \ 139 /MANIFEST \
139 /MANIFESTFILE:"intermediate.manifest" \ 140 /MANIFESTFILE:"intermediate.manifest" \
140 /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ 141 /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \