From 8841e0f3c12a9b7b0470919d721bbe443dbae3bd Mon Sep 17 00:00:00 2001
From: Diego Nehab <diego@tecgraf.puc-rio.br>
Date: Sun, 30 May 2004 23:23:05 +0000
Subject: [PATCH] Updated projects for windows to generate dlls.

---
 luasocket.sln     |  20 ++++---
 luasocket.vcproj  |  65 ++++++++++-----------
 mime.vcproj       | 144 ++++++++++++++++++++++++++++++++++++++++++++++
 src/mime.c        |   2 +-
 src/mime.h        |   9 ++-
 test/mimetest.lua |   2 +-
 6 files changed, 200 insertions(+), 42 deletions(-)
 create mode 100644 mime.vcproj

diff --git a/luasocket.sln b/luasocket.sln
index 25fe127d..6a1d0b89 100644
--- a/luasocket.sln
+++ b/luasocket.sln
@@ -1,5 +1,9 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luasocket", "luasocket.vcproj", "{4FAAB633-F0E7-4D12-B680-D150A0DD7268}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luasocket", "luasocket.vcproj", "{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mime", "mime.vcproj", "{128E8BD0-174A-48F0-8771-92B1E8D18713}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -9,12 +13,14 @@ Global
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{4FAAB633-F0E7-4D12-B680-D150A0DD7268}.Debug.ActiveCfg = Debug|Win32
-		{4FAAB633-F0E7-4D12-B680-D150A0DD7268}.Debug.Build.0 = Debug|Win32
-		{4FAAB633-F0E7-4D12-B680-D150A0DD7268}.Release.ActiveCfg = Release|Win32
-		{4FAAB633-F0E7-4D12-B680-D150A0DD7268}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionItems) = postSolution
+		{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}.Debug.ActiveCfg = Debug|Win32
+		{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}.Debug.Build.0 = Debug|Win32
+		{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}.Release.ActiveCfg = Release|Win32
+		{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}.Release.Build.0 = Release|Win32
+		{128E8BD0-174A-48F0-8771-92B1E8D18713}.Debug.ActiveCfg = Debug|Win32
+		{128E8BD0-174A-48F0-8771-92B1E8D18713}.Debug.Build.0 = Debug|Win32
+		{128E8BD0-174A-48F0-8771-92B1E8D18713}.Release.ActiveCfg = Release|Win32
+		{128E8BD0-174A-48F0-8771-92B1E8D18713}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/luasocket.vcproj b/luasocket.vcproj
index 73d83222..f998a8db 100644
--- a/luasocket.vcproj
+++ b/luasocket.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="luasocket"
-	ProjectGUID="{4FAAB633-F0E7-4D12-B680-D150A0DD7268}"
+	ProjectGUID="{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}"
 	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
@@ -12,18 +12,17 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="."
-			IntermediateDirectory="."
-			ConfigurationType="1"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="net/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE, LUASOCKET_DEBUG"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LUASOCKET_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -32,13 +31,12 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua.lib lualib.lib ws2_32.lib"
-				OutputFile="$(OutDir)/luasocket.exe"
+				OutputFile="$(OutDir)/luasocket.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="net/lib"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/luasocket.pdb"
-				SubSystem="1"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/luasocket.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -65,13 +63,13 @@
 			Name="Release|Win32"
 			OutputDirectory="."
 			IntermediateDirectory="."
-			ConfigurationType="1"
+			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="net/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE, LUASOCKET_DEBUG, LUASOCKET_COMPILED"
-				RuntimeLibrary="4"
+				AdditionalIncludeDirectories="H:\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LUASOCKET_EXPORTS;LUASOCKET_API=__declspec(dllexport); LUASOCKET_COMPILED; LUASOCKET_DEBUG"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="TRUE"
@@ -80,14 +78,14 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="lua.lib lualib.lib ws2_32.lib"
-				OutputFile="$(OutDir)/luasocket.exe"
+				AdditionalDependencies="ws2_32.lib"
+				OutputFile="$(OutDir)/luasocket.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="net/lib"
 				GenerateDebugInformation="TRUE"
-				SubSystem="1"
+				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/luasocket.lib"
 				TargetMachine="1"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -121,6 +119,9 @@
 			<File
 				RelativePath=".\auxiliar.c">
 			</File>
+			<File
+				RelativePath=".\base.c">
+			</File>
 			<File
 				RelativePath=".\buffer.c">
 			</File>
@@ -130,15 +131,9 @@
 			<File
 				RelativePath=".\io.c">
 			</File>
-			<File
-				RelativePath=".\lua.c">
-			</File>
 			<File
 				RelativePath=".\luasocket.c">
 			</File>
-			<File
-				RelativePath=".\mime.c">
-			</File>
 			<File
 				RelativePath=".\options.c">
 			</File>
@@ -169,13 +164,10 @@
 				RelativePath=".\auxiliar.h">
 			</File>
 			<File
-				RelativePath=".\buffer.h">
-			</File>
-			<File
-				RelativePath=".\code.h">
+				RelativePath=".\base.h">
 			</File>
 			<File
-				RelativePath=".\error.h">
+				RelativePath=".\buffer.h">
 			</File>
 			<File
 				RelativePath=".\inet.h">
@@ -186,14 +178,17 @@
 			<File
 				RelativePath=".\luasocket.h">
 			</File>
+			<File
+				RelativePath=".\options.h">
+			</File>
 			<File
 				RelativePath=".\select.h">
 			</File>
 			<File
-				RelativePath=".\socket.h">
+				RelativePath=".\smtp.h">
 			</File>
 			<File
-				RelativePath=".\stdafx.h">
+				RelativePath=".\socket.h">
 			</File>
 			<File
 				RelativePath=".\tcp.h">
@@ -213,6 +208,12 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 		</Filter>
+		<File
+			RelativePath="..\..\lib\lua.lib">
+		</File>
+		<File
+			RelativePath="..\..\lib\lualib.lib">
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/mime.vcproj b/mime.vcproj
new file mode 100644
index 00000000..95d38889
--- /dev/null
+++ b/mime.vcproj
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="mime"
+	ProjectGUID="{128E8BD0-174A-48F0-8771-92B1E8D18713}"
+	Keyword="Win32Proj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MIME_EXPORTS"
+				MinimalRebuild="TRUE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/mime.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/mime.pdb"
+				SubSystem="2"
+				ImportLibrary="$(OutDir)/mime.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="."
+			IntermediateDirectory="."
+			ConfigurationType="2"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="H:\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MIME_EXPORTS; MIME_API=__declspec(dllexport)"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)/mime.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="TRUE"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/mime.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath=".\mime.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\mime.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+		<File
+			RelativePath="..\..\lib\lua.lib">
+		</File>
+		<File
+			RelativePath="..\..\lib\lualib.lib">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/mime.c b/src/mime.c
index 8cfcd26d..966509b0 100644
--- a/src/mime.c
+++ b/src/mime.c
@@ -74,7 +74,7 @@ static UC b64unbase[256];
 /*-------------------------------------------------------------------------*\
 * Initializes module
 \*-------------------------------------------------------------------------*/
-int luaopen_mime(lua_State *L)
+MIME_API int luaopen_mime(lua_State *L)
 {
     lua_pushstring(L, MIME_LIBNAME);
     lua_setglobal(L, "MIME_LIBNAME");
diff --git a/src/mime.h b/src/mime.h
index fee4e5e3..35389f02 100644
--- a/src/mime.h
+++ b/src/mime.h
@@ -12,7 +12,14 @@
 \*=========================================================================*/
 #include <lua.h>
 
-int luaopen_mime(lua_State *L);
+/*-------------------------------------------------------------------------*\
+* This macro prefixes all exported API functions
+\*-------------------------------------------------------------------------*/
+#ifndef MIME_API
+#define MIME_API extern
+#endif
+
+MIME_API int luaopen_mime(lua_State *L);
 
 /*-------------------------------------------------------------------------*\
 * Library's namespace
diff --git a/test/mimetest.lua b/test/mimetest.lua
index d0921755..30bfca1e 100644
--- a/test/mimetest.lua
+++ b/test/mimetest.lua
@@ -8,7 +8,7 @@ local qptest = "qptest.bin"
 local eqptest = "qptest.bin2"
 local dqptest = "qptest.bin3"
 
-local b64test = "libluasocket.dylib"
+local b64test = "libluasocket.so"
 local eb64test = "b64test.bin"
 local db64test = "b64test.bin2"