diff options
author | E. Westbrook <github@westbrook.io> | 2019-02-25 16:04:49 -0700 |
---|---|---|
committer | E. Westbrook <github@westbrook.io> | 2019-02-25 16:04:49 -0700 |
commit | 2d8f0d99011b267ed354ab6e8317d93b9627eed4 (patch) | |
tree | b6fd79b851887393c5793e9b38dcb879fbb009ee /src | |
parent | f8183bab875f541af3932fe4e430fcff8bd8aba0 (diff) | |
download | luasocket-2d8f0d99011b267ed354ab6e8317d93b9627eed4.tar.gz luasocket-2d8f0d99011b267ed354ab6e8317d93b9627eed4.tar.bz2 luasocket-2d8f0d99011b267ed354ab6e8317d93b9627eed4.zip |
src/makefile: remove visibility and dllexport defines in favor of in-source labeling
Diffstat (limited to 'src')
-rw-r--r-- | src/makefile | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/src/makefile b/src/makefile index cc1ec7e..74bf3d5 100644 --- a/src/makefile +++ b/src/makefile | |||
@@ -149,12 +149,8 @@ PLATS= macosx linux win32 mingw solaris | |||
149 | SO_macosx=so | 149 | SO_macosx=so |
150 | O_macosx=o | 150 | O_macosx=o |
151 | CC_macosx=gcc | 151 | CC_macosx=gcc |
152 | DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \ | 152 | DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN |
153 | -DLUASOCKET_API='__attribute__((visibility("default")))' \ | 153 | CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common |
154 | -DUNIX_API='__attribute__((visibility("default")))' \ | ||
155 | -DMIME_API='__attribute__((visibility("default")))' | ||
156 | CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common \ | ||
157 | -fvisibility=hidden | ||
158 | LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o | 154 | LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o |
159 | LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc | 155 | LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc |
160 | SOCKET_macosx=usocket.o | 156 | SOCKET_macosx=usocket.o |
@@ -165,12 +161,9 @@ SOCKET_macosx=usocket.o | |||
165 | SO_linux=so | 161 | SO_linux=so |
166 | O_linux=o | 162 | O_linux=o |
167 | CC_linux=gcc | 163 | CC_linux=gcc |
168 | DEF_linux=-DLUASOCKET_$(DEBUG) \ | 164 | DEF_linux=-DLUASOCKET_$(DEBUG) |
169 | -DLUASOCKET_API='__attribute__((visibility("default")))' \ | ||
170 | -DUNIX_API='__attribute__((visibility("default")))' \ | ||
171 | -DMIME_API='__attribute__((visibility("default")))' | ||
172 | CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ | 165 | CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ |
173 | -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden | 166 | -Wimplicit -O2 -ggdb3 -fpic |
174 | LDFLAGS_linux=-O -shared -fpic -o | 167 | LDFLAGS_linux=-O -shared -fpic -o |
175 | LD_linux=gcc | 168 | LD_linux=gcc |
176 | SOCKET_linux=usocket.o | 169 | SOCKET_linux=usocket.o |
@@ -181,12 +174,9 @@ SOCKET_linux=usocket.o | |||
181 | SO_freebsd=so | 174 | SO_freebsd=so |
182 | O_freebsd=o | 175 | O_freebsd=o |
183 | CC_freebsd=gcc | 176 | CC_freebsd=gcc |
184 | DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN \ | 177 | DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN |
185 | -DLUASOCKET_API='__attribute__((visibility("default")))' \ | ||
186 | -DUNIX_API='__attribute__((visibility("default")))' \ | ||
187 | -DMIME_API='__attribute__((visibility("default")))' | ||
188 | CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ | 178 | CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ |
189 | -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden | 179 | -Wimplicit -O2 -ggdb3 -fpic |
190 | LDFLAGS_freebsd=-O -shared -fpic -o | 180 | LDFLAGS_freebsd=-O -shared -fpic -o |
191 | LD_freebsd=gcc | 181 | LD_freebsd=gcc |
192 | SOCKET_freebsd=usocket.o | 182 | SOCKET_freebsd=usocket.o |
@@ -197,12 +187,9 @@ SOCKET_freebsd=usocket.o | |||
197 | SO_solaris=so | 187 | SO_solaris=so |
198 | O_solaris=o | 188 | O_solaris=o |
199 | CC_solaris=gcc | 189 | CC_solaris=gcc |
200 | DEF_solaris=-DLUASOCKET_$(DEBUG) \ | 190 | DEF_solaris=-DLUASOCKET_$(DEBUG) |
201 | -DLUASOCKET_API='__attribute__((visibility("default")))' \ | ||
202 | -DUNIX_API='__attribute__((visibility("default")))' \ | ||
203 | -DMIME_API='__attribute__((visibility("default")))' | ||
204 | CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ | 191 | CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ |
205 | -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden | 192 | -Wimplicit -O2 -ggdb3 -fpic |
206 | LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o | 193 | LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o |
207 | LD_solaris=gcc | 194 | LD_solaris=gcc |
208 | SOCKET_solaris=usocket.o | 195 | SOCKET_solaris=usocket.o |
@@ -214,10 +201,8 @@ SO_mingw=dll | |||
214 | O_mingw=o | 201 | O_mingw=o |
215 | CC_mingw=gcc | 202 | CC_mingw=gcc |
216 | DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) \ | 203 | DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) \ |
217 | -DWINVER=0x0501 -DLUASOCKET_API='__declspec(dllexport)' \ | 204 | -DWINVER=0x0501 |
218 | -DMIME_API='__declspec(dllexport)' | 205 | CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common |
219 | CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common \ | ||
220 | -fvisibility=hidden | ||
221 | LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o | 206 | LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o |
222 | LD_mingw=gcc | 207 | LD_mingw=gcc |
223 | SOCKET_mingw=wsocket.o | 208 | SOCKET_mingw=wsocket.o |
@@ -230,8 +215,8 @@ SO_win32=dll | |||
230 | O_win32=obj | 215 | O_win32=obj |
231 | CC_win32=cl | 216 | CC_win32=cl |
232 | DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ | 217 | DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ |
233 | //D "LUASOCKET_API=__declspec(dllexport)" //D "_CRT_SECURE_NO_WARNINGS" \ | 218 | //D "_CRT_SECURE_NO_WARNINGS" \ |
234 | //D "_WINDLL" //D "MIME_API=__declspec(dllexport)" \ | 219 | //D "_WINDLL" \ |
235 | //D "LUASOCKET_$(DEBUG)" | 220 | //D "LUASOCKET_$(DEBUG)" |
236 | CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo | 221 | CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo |
237 | LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ | 222 | LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ |