diff --git a/Lua.props b/Lua.props
index bdfca40..d748448 100755
--- a/Lua.props
+++ b/Lua.props
@@ -1,28 +1,49 @@
+
+ $(Platform)/$(Configuration)
+
+
+ $(Configuration)
+
- z:\data\build\vc14\
- $(BUILD)\bin\lua\5.3\
- $(BUILD)\lib\lua\5.3\
- $(BUILD)\include\lua\5.3\
+ 5.3
+ z:\data\build\vc14\
+ $(LUAPREFIX)\lib\lua\$(LUAV)\$(LUAPLAT)
+ $(LUAPREFIX)\bin\lua\$(LUAV)\$(LUAPLAT)
+ $(LUAPREFIX)\bin\lua\$(LUAV)\$(LUAPLAT)\lua
+ $(LUAPREFIX)\include\lua\$(LUAV);$(LUAPREFIX)\include\lua$(LUAV)
+ lua$(LUAV.Replace('.', '')).lib
- <_PropertySheetDisplayName>Lua53
+ <_PropertySheetDisplayName>Lua
+
+ $(LUAPLAT)
+
+
+ $(LUAPREFIX)
+
+
+ $(LUAV)
+
$(LUALIB)
$(LUAINC)
-
- $(LUABIN)
+
+ $(LUACDIR)
-
- $(BUILD)
+
+ $(LUALDIR)
+
+
+ $(LUALIBNAME)
diff --git a/makefile b/makefile
old mode 100644
new mode 100755
index cc15b4e..f766a25
--- a/makefile
+++ b/makefile
@@ -10,7 +10,7 @@
# print print the build settings
PLAT?= linux
-PLATS= macosx linux win32 mingw freebsd solaris
+PLATS= macosx linux win32 win64 mingw freebsd solaris
all: $(PLAT)
diff --git a/mime.vcxproj b/mime.vcxproj
index 74bba0c..6a7b35a 100755
--- a/mime.vcxproj
+++ b/mime.vcxproj
@@ -21,19 +21,6 @@
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
{128E8BD0-174A-48F0-8771-92B1E8D18713}
Win32Proj
@@ -88,7 +75,7 @@
<_ProjectFileVersion>11.0.50727.1
- $(LUABIN)$(Configuration)\mime\
+ $(Configuration)\mime\
$(Configuration)\
true
core
@@ -96,17 +83,17 @@
true
core
- $(LUABIN)$(Platform)\$(Configuration)\mime\
+ $(Platform)\$(Configuration)\mime\
- $(LUABIN)$(Configuration)\mime\
+ $(Configuration)\mime\
$(Configuration)\
false
core
false
- $(LUABIN)$(Platform)\$(Configuration)\mime\
+ $(Platform)\$(Configuration)\mime\
core
@@ -123,9 +110,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -150,9 +137,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -173,9 +160,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -199,9 +186,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
Windows
true
diff --git a/socket.vcxproj b/socket.vcxproj
index cfa32b3..e639216 100755
--- a/socket.vcxproj
+++ b/socket.vcxproj
@@ -32,98 +32,6 @@
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
- Document
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- copy %(FullPath) $(LUABIN)$(Platform)\$(Configuration)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
- $(LUABIN)$(Platform)\$(Configuration)\%(Filename)%(Extension)
-
-
{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}
Win32Proj
@@ -178,7 +86,7 @@
<_ProjectFileVersion>11.0.50727.1
- $(LUABIN)$(Configuration)\socket\
+ $(Configuration)\socket\
$(Configuration)\
true
core
@@ -186,17 +94,17 @@
true
core
- $(LUABIN)$(Platform)\$(Configuration)\socket\
+ $(Platform)\$(Configuration)\socket\
- $(LUABIN)$(Configuration)\socket\
+ $(Configuration)\socket\
$(Configuration)\
false
core
false
- $(LUABIN)$(Platform)\$(Configuration)\socket\
+ $(Platform)\$(Configuration)\socket\
core
@@ -213,9 +121,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;ws2_32.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -240,9 +148,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;ws2_32.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
$(OutDir)mime.pdb
Windows
@@ -263,9 +171,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;ws2_32.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
Windows
true
@@ -289,9 +197,9 @@
$(IntDir)$(TargetName)$(PlatformToolsetVersion).pdb
- lualib.lib;ws2_32.lib;%(AdditionalDependencies)
+ $(LUALIBNAME);ws2_32.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName).dll
- $(LUALIB)$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
+ $(LUALIB);%(AdditionalLibraryDirectories)
true
Windows
true
diff --git a/src/makefile b/src/makefile
old mode 100644
new mode 100755
index 74bf3d5..e6baf78
--- a/src/makefile
+++ b/src/makefile
@@ -12,7 +12,7 @@
#
# make PLAT=linux DEBUG=DEBUG LUAV=5.2 prefix=/sw
-# PLAT: linux macosx win32 mingw
+# PLAT: linux macosx win32 win64 mingw
# platform to build for
PLAT?=linux
@@ -83,7 +83,18 @@ PLATFORM_win32?=Release
CDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)
LDIR_win32?=bin/lua/$(LUAV)/$(PLATFORM_win32)/lua
LUALIB_win32?=$(LUAPREFIX_win32)/lib/lua/$(LUAV)/$(PLATFORM_win32)
-LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib
+LUALIBNAME_win32?=lua$(subst .,,$(LUAV)).lib
+
+# LUAINC_win64:
+# LUALIB_win64:
+# where lua headers and libraries are found for win64 builds
+LUAPREFIX_win64?=
+LUAINC_win64?=$(LUAPREFIX_win64)/include/lua/$(LUAV) $(LUAPREFIX_win64)/include/lua$(LUAV)
+PLATFORM_win64?=x64/Release
+CDIR_win64?=bin/lua/$(LUAV)/$(PLATFORM_win64)
+LDIR_win64?=bin/lua/$(LUAV)/$(PLATFORM_win64)/lua
+LUALIB_win64?=$(LUAPREFIX_win64)/lib/lua/$(LUAV)/$(PLATFORM_win64)
+LUALIBNAME_win64?=lua$(subst .,,$(LUAV)).lib
# LUAINC_solaris:
@@ -141,7 +152,7 @@ print:
#------
# Supported platforms
#
-PLATS= macosx linux win32 mingw solaris
+PLATS= macosx linux win32 win64 mingw solaris
#------
# Compiler and linker settings
@@ -152,7 +163,7 @@ CC_macosx=gcc
DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
-LD_macosx= export MACOSX_DEPLOYMENT_TARGET="10.3"; gcc
+LD_macosx=gcc
SOCKET_macosx=usocket.o
#------
@@ -217,17 +228,39 @@ CC_win32=cl
DEF_win32= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \
//D "_CRT_SECURE_NO_WARNINGS" \
//D "_WINDLL" \
- //D "LUASOCKET_$(DEBUG)"
+ //D "LUASOCKET_$(DEBUG)"
CFLAGS_win32=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo
LDFLAGS_win32= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \
//MANIFEST //MANIFESTFILE:"intermediate.manifest" \
- //MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
+ /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
//SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \
- //MACHINE:X86 /LIBPATH:"$(shell cmd //c echo $(LUALIB))" \
+ //MACHINE:X86 /LIBPATH:"$(LUALIB)" \
$(LUALIBNAME_win32) ws2_32.lib //OUT:
+
LD_win32=cl
SOCKET_win32=wsocket.obj
+#------
+# Compiler and linker settings
+# for Win64
+SO_win64=dll
+O_win64=obj
+CC_win64=cl
+DEF_win64= //D "WIN32" //D "NDEBUG" //D "_WINDOWS" //D "_USRDLL" \
+ //D "_CRT_SECURE_NO_WARNINGS" \
+ //D "_WINDLL" \
+ //D "LUASOCKET_$(DEBUG)"
+CFLAGS_win64=$(LUAINC:%=//I "%") $(DEF) //O2 //Ot //MD //W3 //nologo
+LDFLAGS_win64= //nologo //link //NOLOGO //DLL //INCREMENTAL:NO \
+ //MANIFEST //MANIFESTFILE:"intermediate.manifest" \
+ /MANIFESTUAC:"level='asInvoker' uiAccess='false'" \
+ //SUBSYSTEM:WINDOWS //OPT:REF //OPT:ICF //DYNAMICBASE:NO \
+ /LIBPATH:"$(LUALIB)" \
+ $(LUALIBNAME_win64) ws2_32.lib //OUT:
+
+LD_win64=cl
+SOCKET_win64=wsocket.obj
+
.SUFFIXES: .obj
.c.obj:
@@ -340,6 +373,9 @@ macosx:
win32:
$(MAKE) all PLAT=win32
+win64:
+ $(MAKE) all PLAT=win64
+
linux:
$(MAKE) all-unix PLAT=linux
diff --git a/vc32.bat b/vc32.bat
new file mode 100755
index 0000000..7ff8c0e
--- /dev/null
+++ b/vc32.bat
@@ -0,0 +1,3 @@
+call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
+cls
+"c:\Program Files\Git\git-bash.exe" --cd-to-home
diff --git a/vc64.bat b/vc64.bat
new file mode 100755
index 0000000..ed5cb3a
--- /dev/null
+++ b/vc64.bat
@@ -0,0 +1,3 @@
+call "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
+cls
+"c:\Program Files\Git\git-bash.exe" --cd-to-home
diff --git a/win32.cmd b/win32.cmd
old mode 100644
new mode 100755
index 3045721..5eda3b1
--- a/win32.cmd
+++ b/win32.cmd
@@ -1 +1 @@
-make LUAPREFIX_win32='c:\cygwin\home\diego\vc12' LUAV=5.1 PLAT=win32 LUALIBNAME_win32=lualib.lib PLATFORM_win32=Debug install-both
+LUAV=5.3 PLAT=win32 LUAPREFIX_win32=/z/data/build/vc14 make
diff --git a/win64.cmd b/win64.cmd
new file mode 100755
index 0000000..b1f9ac0
--- /dev/null
+++ b/win64.cmd
@@ -0,0 +1 @@
+LUAV=5.3 PLAT=win64 LUAPREFIX_win64=/z/data/build/vc14 make