aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsocket.vcxproj8
-rw-r--r--src/makefile6
2 files changed, 7 insertions, 7 deletions
diff --git a/socket.vcxproj b/socket.vcxproj
index 53c5539..307a8ae 100755
--- a/socket.vcxproj
+++ b/socket.vcxproj
@@ -212,7 +212,7 @@
212 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 212 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
213 </ClCompile> 213 </ClCompile>
214 <Link> 214 <Link>
215 <AdditionalDependencies>$(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 215 <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
216 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 216 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
217 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 217 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
218 <GenerateDebugInformation>true</GenerateDebugInformation> 218 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -239,7 +239,7 @@
239 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 239 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
240 </ClCompile> 240 </ClCompile>
241 <Link> 241 <Link>
242 <AdditionalDependencies>$(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 242 <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
243 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 243 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
244 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 244 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
245 <GenerateDebugInformation>true</GenerateDebugInformation> 245 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -262,7 +262,7 @@
262 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 262 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
263 </ClCompile> 263 </ClCompile>
264 <Link> 264 <Link>
265 <AdditionalDependencies>$(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 265 <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
266 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 266 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
267 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 267 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
268 <GenerateDebugInformation>true</GenerateDebugInformation> 268 <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -288,7 +288,7 @@
288 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName> 288 <ProgramDataBaseFileName>$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
289 </ClCompile> 289 </ClCompile>
290 <Link> 290 <Link>
291 <AdditionalDependencies>$(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> 291 <AdditionalDependencies>$(LUALIB);ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
292 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile> 292 <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
293 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> 293 <AdditionalLibraryDirectories>$(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
294 <GenerateDebugInformation>true</GenerateDebugInformation> 294 <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/src/makefile b/src/makefile
index c44f4ef..94a2f9f 100644
--- a/src/makefile
+++ b/src/makefile
@@ -160,7 +160,7 @@ DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) -DLUA_COMPAT_MODULE \
160 -DMIME_API='__declspec(dllexport)' 160 -DMIME_API='__declspec(dllexport)'
161CFLAGS_mingw= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \ 161CFLAGS_mingw= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \
162 -fvisibility=hidden 162 -fvisibility=hidden
163LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lwsock32 -lws2_32 -o 163LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
164LD_mingw=gcc 164LD_mingw=gcc
165SOCKET_mingw=wsocket.o 165SOCKET_mingw=wsocket.o
166 166
@@ -181,8 +181,8 @@ LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \
181 //MANIFEST //MANIFESTFILE:"intermediate.manifest" \ 181 //MANIFEST //MANIFESTFILE:"intermediate.manifest" \
182 //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ 182 //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
183 //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \ 183 //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \
184 //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" lua$(subst .,,$(LUAV)).lib \ 184 //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" \
185 wsock32.lib ws2_32.lib //OUT: 185 lua$(subst .,,$(LUAV)).lib ws2_32.lib //OUT:
186LD_win32=cl 186LD_win32=cl
187SOCKET_win32=wsocket.obj 187SOCKET_win32=wsocket.obj
188 188