From bb0b31301a43e740f30cf438f9f2b3e68fbd7698 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 25 May 2013 18:07:38 +0800 Subject: Add MingW support. --- src/makefile | 114 ++++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 78 insertions(+), 36 deletions(-) (limited to 'src/makefile') diff --git a/src/makefile b/src/makefile index a75d5a6..a6e0033 100644 --- a/src/makefile +++ b/src/makefile @@ -12,7 +12,7 @@ # # make PLAT=linux DEBUG=DEBUG LUAV=5.2 prefix=/sw -# PLAT: linux macosx win32 +# PLAT: linux macosx win32 mingw # platform to build for PLAT?=linux @@ -33,6 +33,9 @@ LUAINC_macosx?=$(LUAINC_macosx_base)/lua$(LUAV) # FIXME default should this default to fink or to macports? # What happens when more than one Lua version is installed? LUAPREFIX_macosx?=/opt/local +CDIR_macosx?=lib/lua/$(LUAV) +LDIR_macosx?=share/lua/$(LUAV) + # LUAINC_linux: # /usr/include/lua$(LUAV) @@ -42,19 +45,38 @@ LUAPREFIX_macosx?=/opt/local LUAINC_linux_base?=/usr/include LUAINC_linux?=$(LUAINC_linux_base)/lua$(LUAV) LUAPREFIX_linux?=/usr/local +CDIR_linux?=lib/lua/$(LUAV) +LDIR_linux?=share/lua/$(LUAV) + +# where lua headers are found for mingw builds +# LUAINC_mingw: +# /opt/local/include +LUAINC_mingw_base?=/usr/include +LUAINC_mingw?=$(LUAINC_mingw_base)/lua/$(LUAV) +LUALIB_mingw_base?=/usr/bin +LUALIB_mingw?=$(LUALIB_mingw_base)/lua/$(LUAV)/lua$(subst .,,$(LUAV)).dll +LUAPREFIX_mingw?=/usr +CDIR_mingw?=lua/$(LUAV) +LDIR_mingw?=lua/$(LUAV)/lua + # LUAINC_win32: # LUALIB_win32: # where lua headers and libraries are found for win32 builds LUAINC_win32?="../../lua-5.1.3/src" -LUALIB_win32?="../../lua-5.1.3" +LUALIB_win32?=/LIBPATH:"../../lua-5.1.3" lua$(LUAV).lib + LUAPREFIX_win32?= -# FIXME default should be where lua-for-windows puts lua +CDIR_win32?=lua/$(LUAV) +LDIR_win32?=lua/$(LUAV)/lua # prefix: /usr/local /usr /opt/local /sw # the top of the default install tree prefix?=$(LUAPREFIX_$(PLAT)) +CDIR?=$(CDIR_$(PLAT)) +LDIR?=$(LDIR_$(PLAT)) + # DESTDIR: (no default) # used by package managers to install into a temporary destination DESTDIR= @@ -63,13 +85,6 @@ DESTDIR= # Definitions below can be overridden on the make command line, but # shouldn't have to be. -print: - @echo PLAT=$(PLAT) - @echo LUAV=$(LUAV) - @echo DEBUG=$(DEBUG) - @echo prefix=$(prefix) - @echo LUAINC_$(PLAT)=$(LUAINC_$(PLAT)) - @echo LUALIB_$(PLAT)=$(LUALIB_$(PLAT)) #------ # Install directories @@ -80,18 +95,28 @@ INSTALL_DATA=install -m644 INSTALL_EXEC=install INSTALL_TOP=$(DESTDIR)$(prefix) -INSTALL_TOP_SHARE=$(INSTALL_TOP)/share/lua/$(LUAV) -INSTALL_TOP_LIB=$(INSTALL_TOP)/lib/lua/$(LUAV) +INSTALL_TOP_LDIR=$(INSTALL_TOP)/$(LDIR) +INSTALL_TOP_CDIR=$(INSTALL_TOP)/$(CDIR) + +INSTALL_SOCKET_LDIR=$(INSTALL_TOP_LDIR)/socket +INSTALL_SOCKET_CDIR=$(INSTALL_TOP_CDIR)/socket +INSTALL_MIME_LDIR=$(INSTALL_TOP_LDIR)/mime +INSTALL_MIME_CDIR=$(INSTALL_TOP_CDIR)/mime -INSTALL_SOCKET_SHARE=$(INSTALL_TOP_SHARE)/socket -INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket -INSTALL_MIME_SHARE=$(INSTALL_TOP_SHARE)/mime -INSTALL_MIME_LIB=$(INSTALL_TOP_LIB)/mime +print: + @echo PLAT=$(PLAT) + @echo LUAV=$(LUAV) + @echo DEBUG=$(DEBUG) + @echo prefix=$(prefix) + @echo LUAINC_$(PLAT)=$(LUAINC_$(PLAT)) + @echo LUALIB_$(PLAT)=$(LUALIB_$(PLAT)) + @echo INSTALL_TOP_CDIR=$(INSTALL_TOP_CDIR) + @echo INSTALL_TOP_LDIR=$(INSTALL_TOP_LDIR) #------ # Supported platforms # -PLATS= macosx linux win32 +PLATS= macosx linux win32 mingw #------ # Compiler and linker settings @@ -117,12 +142,28 @@ CC_linux=gcc DEF_linux=-DLUASOCKET_$(DEBUG) -DLUA_COMPAT_MODULE \ -DLUASOCKET_API='__attribute__((visibility("default")))' \ -DMIME_API='__attribute__((visibility("default")))' -CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra -Wimplicit -O2 -ggdb3 -fpic \ - -fvisibility=hidden +CFLAGS_linux= -I$(LUAINC) $(DEF) -pedantic -Wall -Wshadow -Wextra \ + -Wimplicit -O2 -ggdb3 -fpic -fvisibility=hidden LDFLAGS_linux=-O -shared -fpic -o LD_linux=gcc SOCKET_linux=usocket.o +#------ +# Compiler and linker settings +# for MingW +SO_mingw=dll +O_mingw=o +CC_mingw=gcc +DEF_mingw= -DLUASOCKET_$(DEBUG) -DLUA_COMPAT_MODULE -DWINVER=0x0501 \ + -DLUASOCKET_API='__declspec(dllexport)' \ + -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 +LD_mingw=gcc +SOCKET_mingw=wsocket.o + + #------ # Compiler and linker settings # for Win32 @@ -135,12 +176,10 @@ DEF_win32= /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" \ /D "LUASOCKET_$(DEBUG)" CFLAGS_win32=/I "$(LUAINC)" $(DEF) /O2 /Ot /MD /W3 /nologo LDFLAGS_win32= /nologo /link /NOLOGO /DLL /INCREMENTAL:NO \ - /LIBPATH:"$(LUALIB)" \ - /MANIFEST \ - /MANIFESTFILE:"intermediate.manifest" \ + /MANIFEST /MANIFESTFILE:"intermediate.manifest" \ /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \ /SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /DYNAMICBASE:NO \ - /MACHINE:X86 ws2_32.lib lua$(LUAV).lib /OUT: + /MACHINE:X86 $(LUALIB) ws2_32.lib /OUT: LD_win32=cl SOCKET_win32=wsocket.obj @@ -223,7 +262,7 @@ SERIAL_OBJS:=\ #------ # Files to install # -TO_SOCKET_SHARE= \ +TO_SOCKET_LDIR= \ http.lua \ url.lua \ tp.lua \ @@ -231,7 +270,7 @@ TO_SOCKET_SHARE= \ headers.lua \ smtp.lua -TO_TOP_SHARE= \ +TO_TOP_LDIR= \ ltn12.lua \ socket.lua \ mime.lua @@ -250,6 +289,9 @@ win32: linux: $(MAKE) all-unix PLAT=linux +mingw: + $(MAKE) all PLAT=mingw + none: @echo "Please run" @echo " make PLATFORM" @@ -273,21 +315,21 @@ $(SERIAL_SO): $(SERIAL_OBJS) $(LD) $(SERIAL_OBJS) $(LDFLAGS)$@ install: - $(INSTALL_DIR) $(INSTALL_TOP_SHARE) - $(INSTALL_DATA) $(TO_TOP_SHARE) $(INSTALL_TOP_SHARE) - $(INSTALL_DIR) $(INSTALL_SOCKET_SHARE) - $(INSTALL_DATA) $(TO_SOCKET_SHARE) $(INSTALL_SOCKET_SHARE) - $(INSTALL_DIR) $(INSTALL_SOCKET_LIB) - $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET_LIB)/core.$(SO) - $(INSTALL_DIR) $(INSTALL_MIME_LIB) - $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(SO) + $(INSTALL_DIR) $(INSTALL_TOP_LDIR) + $(INSTALL_DATA) $(TO_TOP_LDIR) $(INSTALL_TOP_LDIR) + $(INSTALL_DIR) $(INSTALL_SOCKET_LDIR) + $(INSTALL_DATA) $(TO_SOCKET_LDIR) $(INSTALL_SOCKET_LDIR) + $(INSTALL_DIR) $(INSTALL_SOCKET_CDIR) + $(INSTALL_EXEC) $(SOCKET_SO) $(INSTALL_SOCKET_CDIR)/core.$(SO) + $(INSTALL_DIR) $(INSTALL_MIME_CDIR) + $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_CDIR)/core.$(SO) install-unix: install - $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_SOCKET_LIB)/$(UNIX_SO) - $(INSTALL_EXEC) $(SERIAL_SO) $(INSTALL_SOCKET_LIB)/$(SERIAL_SO) + $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_SOCKET_CDIR)/$(UNIX_SO) + $(INSTALL_EXEC) $(SERIAL_SO) $(INSTALL_SOCKET_CDIR)/$(SERIAL_SO) local: - $(MAKE) install INSTALL_TOP_LIB=.. INSTALL_TOP_SHARE=.. + $(MAKE) install INSTALL_TOP_CDIR=.. INSTALL_TOP_LDIR=.. clean: rm -f $(SOCKET_SO) $(SOCKET_OBJS) $(SERIAL_OBJS) -- cgit v1.2.3-55-g6feb From 22107bb9fcb3eef565b93fb00d8f2cc8849ba08e Mon Sep 17 00:00:00 2001 From: Diego Nehab Date: Sat, 25 May 2013 07:25:02 -0300 Subject: Check linux build. --- linux.cmd | 2 +- src/makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/makefile') diff --git a/linux.cmd b/linux.cmd index dc7fcaa..bd59adc 100644 --- a/linux.cmd +++ b/linux.cmd @@ -1 +1 @@ -make PLAT=linux LUAV=5.2 DEBUG=DEBUG +make PLAT=linux DEBUG=DEBUG LUAINC_linux_base=/home/diego/build/linux/include LUAPREFIX_linux=/home/diego/build/linux diff --git a/src/makefile b/src/makefile index a6e0033..fbb26a0 100644 --- a/src/makefile +++ b/src/makefile @@ -29,7 +29,7 @@ DEBUG?=NODEBUG # LUAINC_macosx: # /opt/local/include LUAINC_macosx_base?=/opt/local/include -LUAINC_macosx?=$(LUAINC_macosx_base)/lua$(LUAV) +LUAINC_macosx?=$(LUAINC_macosx_base)/lua/$(LUAV) # FIXME default should this default to fink or to macports? # What happens when more than one Lua version is installed? LUAPREFIX_macosx?=/opt/local @@ -43,7 +43,7 @@ LDIR_macosx?=share/lua/$(LUAV) # /usr/local/include/lua$(LUAV) # where lua headers are found for linux builds LUAINC_linux_base?=/usr/include -LUAINC_linux?=$(LUAINC_linux_base)/lua$(LUAV) +LUAINC_linux?=$(LUAINC_linux_base)/lua/$(LUAV) LUAPREFIX_linux?=/usr/local CDIR_linux?=lib/lua/$(LUAV) LDIR_linux?=share/lua/$(LUAV) -- cgit v1.2.3-55-g6feb From 26704061a4e28eff573f02297e6da045d166afa4 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 May 2013 20:30:06 +0800 Subject: Fix Visual Studio 2012 projects --- .gitignore | 12 +++++ Lua51.props | 28 +++++++++++ Lua52.props | 28 +++++++++++ mime.vcxproj | 54 ++++++++++++++------ mime.vcxproj.filters | 16 ++++++ socket.vcxproj | 133 +++++++++++++++++++++++++++++++++++++++++++------ socket.vcxproj.filters | 51 +++++++++++++++++++ src/inet.c | 4 +- src/inet.h | 7 ++- src/makefile | 39 ++++++++------- 10 files changed, 316 insertions(+), 56 deletions(-) create mode 100644 Lua51.props create mode 100644 Lua52.props create mode 100644 mime.vcxproj.filters create mode 100644 socket.vcxproj.filters (limited to 'src/makefile') diff --git a/.gitignore b/.gitignore index 4b30ae0..8307483 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,16 @@ *.o *.so *.so.* +*.obj +*.lib +*.dll* +*.user +*.sdf +Lua.props +Debug +Release +*.manifest +*.swp +*.suo +x64 diff --git a/Lua51.props b/Lua51.props new file mode 100644 index 0000000..1bd6256 --- /dev/null +++ b/Lua51.props @@ -0,0 +1,28 @@ + + + + + ..\build\vc12\bin\lua\5.1\ + ..\build\vc12\bin\lua\5.1\ + ..\build\vc12\include\lua\5.1\ + lua51.lib + + + <_PropertySheetDisplayName>Lua51 + + + + + $(LUALIB_PATH) + + + $(LUABIN_PATH) + + + $(LUAINC_PATH) + + + $(LUALIB) + + + diff --git a/Lua52.props b/Lua52.props new file mode 100644 index 0000000..01afcfa --- /dev/null +++ b/Lua52.props @@ -0,0 +1,28 @@ + + + + + ..\build\vc12\bin\lua\5.2\ + ..\build\vc12\bin\lua\5.2\ + ..\build\vc12\include\lua\5.2\ + lua52.lib + + + <_PropertySheetDisplayName>Lua52 + + + + + $(LUALIB_PATH) + + + $(LUABIN_PATH) + + + $(LUAINC_PATH) + + + $(LUALIB) + + + diff --git a/mime.vcxproj b/mime.vcxproj index 95781f2..63f5452 100755 --- a/mime.vcxproj +++ b/mime.vcxproj @@ -21,6 +21,19 @@ + + + Document + copy %(FullPath) $(LUABIN_PATH)$(Configuration) + $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN_PATH)$(Configuration) + $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) + copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration) + copy %(FullPath) $(LUALIB_PATH)$(Platform)\$(Configuration) + $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + + {128E8BD0-174A-48F0-8771-92B1E8D18713} Win32Proj @@ -52,25 +65,29 @@ + + + + <_ProjectFileVersion>11.0.50727.1 - $(SolutionDir)\$(Configuration)\mime\ + $(LUABIN_PATH)$(Configuration)\mime\ $(Configuration)\ true core @@ -78,23 +95,23 @@ true core - $(SolutionDir)$(Platform)\$(Configuration)\mime\ + $(LUABIN_PATH)$(Platform)\$(Configuration)\mime\ - $(SolutionDir)\$(Configuration)\mime\ + $(LUABIN_PATH)$(Configuration)\mime\ $(Configuration)\ false core false - $(SolutionDir)$(Platform)\$(Configuration)\mime\ + $(LUABIN_PATH)$(Platform)\$(Configuration)\mime\ core Disabled - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;%(PreprocessorDefinitions) true EnableFastChecks @@ -102,11 +119,12 @@ Level3 EditAndContinue + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIB);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -114,12 +132,13 @@ $(OutDir)$(TargetName).lib MachineX86 + false Disabled - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -127,11 +146,12 @@ Level3 ProgramDatabase + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIB);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -143,17 +163,18 @@ - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;%(PreprocessorDefinitions) MultiThreadedDLL Level4 + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIB);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) true Windows true @@ -166,7 +187,7 @@ - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -174,11 +195,12 @@ Level4 + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;%(AdditionalDependencies) + $(LUALIB);%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows true diff --git a/mime.vcxproj.filters b/mime.vcxproj.filters new file mode 100644 index 0000000..621215b --- /dev/null +++ b/mime.vcxproj.filters @@ -0,0 +1,16 @@ + + + + + + + + {fad87a86-297c-4881-a114-73b967bb3c92} + + + + + cdir + + + \ No newline at end of file diff --git a/socket.vcxproj b/socket.vcxproj index 0256c90..53c5539 100755 --- a/socket.vcxproj +++ b/socket.vcxproj @@ -32,6 +32,98 @@ + + + Document + copy %(FullPath) $(LUABIN_PATH)$(Configuration) + copy %(FullPath) $(LUABIN_PATH)$(Configuration) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) + $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + + + Document + copy %(FullPath) $(LUABIN_PATH)$(Configuration) + copy %(FullPath) $(LUABIN_PATH)$(Configuration) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration) + $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\%(Filename)%(Extension) + + + + + Document + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + + + Document + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + + + Document + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + + + Document + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + + + Document + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + + + Document + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + $(LUABIN_PATH)$(Configuration)\socket\%(Filename)%(Extension) + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Platform)\$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + copy %(FullPath) $(LUABIN_PATH)$(Configuration)\socket + + {66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} Win32Proj @@ -63,25 +155,29 @@ + + + + <_ProjectFileVersion>11.0.50727.1 - $(SolutionDir)\$(Configuration)\socket\ + $(LUALIB_PATH)$(Configuration)\socket\ $(Configuration)\ true core @@ -89,23 +185,23 @@ true core - $(SolutionDir)$(Platform)\$(Configuration)\socket\ + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\ - $(SolutionDir)\$(Configuration)\socket\ + $(LUALIB_PATH)$(Configuration)\socket\ $(Configuration)\ false core false - $(SolutionDir)$(Platform)\$(Configuration)\socket\ + $(LUABIN_PATH)$(Platform)\$(Configuration)\socket\ core Disabled - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;LUASOCKET_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -113,11 +209,12 @@ Level3 EditAndContinue + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -125,12 +222,13 @@ $(OutDir)$(TargetName).lib MachineX86 + false Disabled - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;LUASOCKET_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -138,11 +236,12 @@ Level3 ProgramDatabase + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true $(OutDir)mime.pdb Windows @@ -154,17 +253,18 @@ - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;%(PreprocessorDefinitions) MultiThreadedDLL Level4 + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Configuration);%(AdditionalLibraryDirectories) true Windows true @@ -177,7 +277,7 @@ - ..\include;%(AdditionalIncludeDirectories) + $(LUAINC_PATH);%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_API=__declspec(dllexport);_CRT_SECURE_NO_WARNINGS;LUA_COMPAT_MODULE;%(PreprocessorDefinitions) MultiThreadedDLL @@ -185,11 +285,12 @@ Level4 + $(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb - lualib.lib;ws2_32.lib;%(AdditionalDependencies) + $(LUALIB);wsock32.lib;ws2_32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).dll - ..\bin\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) + $(LUALIB_PATH)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) true Windows true diff --git a/socket.vcxproj.filters b/socket.vcxproj.filters new file mode 100644 index 0000000..38f2f07 --- /dev/null +++ b/socket.vcxproj.filters @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + cdir + + + cdir + + + ldir + + + ldir + + + ldir + + + ldir + + + ldir + + + ldir + + + + + {b053460d-5439-4e3a-a2eb-c31a95b5691f} + + + {b301b82c-37cb-4e05-9333-194e92ed7a62} + + + \ No newline at end of file diff --git a/src/inet.c b/src/inet.c index 5bc6364..51e8cfe 100644 --- a/src/inet.c +++ b/src/inet.c @@ -502,7 +502,7 @@ const char *inet_trybind(p_socket ps, const char *address, const char *serv, * Some systems do not provide this so that we provide our own. It's not * marvelously fast, but it works just fine. \*-------------------------------------------------------------------------*/ -#ifdef INET_ATON +#ifdef LUASOCKET_INET_ATON int inet_aton(const char *cp, struct in_addr *inp) { unsigned int a = 0, b = 0, c = 0, d = 0; @@ -529,7 +529,7 @@ int inet_aton(const char *cp, struct in_addr *inp) * http://mingw-users.1079350.n2.nabble.com/IPv6-getaddrinfo-amp-inet-ntop-td5891996.html \*-------------------------------------------------------------------------*/ -#ifdef INET_PTON +#ifdef LUASOCKET_INET_PTON const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { if (af == AF_INET) { diff --git a/src/inet.h b/src/inet.h index 252e293..1f1a96a 100644 --- a/src/inet.h +++ b/src/inet.h @@ -19,8 +19,7 @@ #include "timeout.h" #ifdef _WIN32 -#define INET_ATON -#define INET_PTON +#define LUASOCKET_INET_ATON #endif int inet_open(lua_State *L); @@ -39,11 +38,11 @@ int inet_meth_getsockname(lua_State *L, p_socket ps, int family); int inet_optfamily(lua_State* L, int narg, const char* def); int inet_optsocktype(lua_State* L, int narg, const char* def); -#ifdef INET_ATON +#ifdef LUASOCKET_INET_ATON int inet_aton(const char *cp, struct in_addr *inp); #endif -#ifdef INET_PTON +#ifdef LUASOCKET_INET_PTON const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); int inet_pton(int af, const char *src, void *dst); #endif diff --git a/src/makefile b/src/makefile index fbb26a0..c44f4ef 100644 --- a/src/makefile +++ b/src/makefile @@ -63,12 +63,13 @@ LDIR_mingw?=lua/$(LUAV)/lua # LUAINC_win32: # LUALIB_win32: # where lua headers and libraries are found for win32 builds -LUAINC_win32?="../../lua-5.1.3/src" -LUALIB_win32?=/LIBPATH:"../../lua-5.1.3" lua$(LUAV).lib - +LUAINC_win32_base?= +LUAINC_win32?=$(LUAINC_win32_base)/lua/$(LUAV) +PLATFORM_win32?=Release LUAPREFIX_win32?= -CDIR_win32?=lua/$(LUAV) -LDIR_win32?=lua/$(LUAV)/lua +CDIR_win32?=lua/$(LUAV)/$(PLATFORM_win32) +LDIR_win32?=lua/$(LUAV)/$(PLATFORM_win32)/lua +LUALIB_win32?=$(LUAPREFIX_win32)/lua/$(LUAV)/$(PLATFORM_win32) # prefix: /usr/local /usr /opt/local /sw # the top of the default install tree @@ -154,8 +155,8 @@ SOCKET_linux=usocket.o SO_mingw=dll O_mingw=o CC_mingw=gcc -DEF_mingw= -DLUASOCKET_$(DEBUG) -DLUA_COMPAT_MODULE -DWINVER=0x0501 \ - -DLUASOCKET_API='__declspec(dllexport)' \ +DEF_mingw= -DLUASOCKET_INET_PTON -DLUASOCKET_$(DEBUG) -DLUA_COMPAT_MODULE \ + -DWINVER=0x0501 -DLUASOCKET_API='__declspec(dllexport)' \ -DMIME_API='__declspec(dllexport)' CFLAGS_mingw= -I$(LUAINC) $(DEF) -pedantic -Wall -O2 -fno-common \ -fvisibility=hidden @@ -170,23 +171,25 @@ SOCKET_mingw=wsocket.o SO_win32=dll O_win32=obj CC_win32=cl -DEF_win32= /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" \ - /D "LUASOCKET_API=__declspec(dllexport)" /D "_CRT_SECURE_NO_WARNINGS" \ - /D "_WINDLL" /D "LUA_COMPAT_MODULE" /D "MIME_API=__declspec(dllexport)" \ - /D "LUASOCKET_$(DEBUG)" -CFLAGS_win32=/I "$(LUAINC)" $(DEF) /O2 /Ot /MD /W3 /nologo -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 $(LUALIB) ws2_32.lib /OUT: +DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \ + //D "LUASOCKET_API=__declspec(dllexport)" //D "_CRT_SECURE_NO_WARNINGS" \ + //D "_WINDLL" //D "LUA_COMPAT_MODULE" \ + //D "MIME_API=__declspec(dllexport)" \ + //D "LUASOCKET_$(DEBUG)" +CFLAGS_win32=//I "$(LUAINC)" $(DEF) //O2 //Ot //MD //W3 //nologo +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: LD_win32=cl SOCKET_win32=wsocket.obj .SUFFIXES: .obj .c.obj: - $(CC) $(CFLAGS) /Fo"$@" /c $< + $(CC) $(CFLAGS) //Fo"$@" //c $< #------ # Output file names -- cgit v1.2.3-55-g6feb