diff --git a/socket.vcxproj b/socket.vcxproj index 53c5539..307a8ae 100755 --- a/socket.vcxproj +++ b/socket.vcxproj @@ -212,7 +212,7 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) true @@ -239,7 +239,7 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true @@ -262,7 +262,7 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) true @@ -288,7 +288,7 @@ $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true 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 \ -DMIME_API='__declspec(dllexport)' CFLAGS_mingw= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \ -fvisibility=hidden -LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lwsock32 -lws2_32 -o +LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o LD_mingw=gcc SOCKET_mingw=wsocket.o @@ -181,8 +181,8 @@ LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \ //MANIFEST //MANIFESTFILE:"intermediate.manifest" \ //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \ - //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" lua$(subst .,,$(LUAV)).lib \ - wsock32.lib ws2_32.lib //OUT: + //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" \ + lua$(subst .,,$(LUAV)).lib ws2_32.lib //OUT: LD_win32=cl SOCKET_win32=wsocket.obj