compile acl on MSYS.

fast01 · Feb 21, 2017 · e5f7aa1 · e5f7aa1
1 parent 193ac62
commit e5f7aa1
Show file tree

Hide file tree

Showing 38 changed files with 11,286 additions and 6,805 deletions.
diff --git a/acl_cpp_vc2012.sln b/acl_cpp_vc2012.sln
@@ -713,6 +713,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mmap", "lib_acl\samples\mma
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fstream", "lib_acl\samples\fstream\fstream_vc2012.vcxproj", "{5D57BF9A-188B-4250-991C-74264A146EAE}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite", "lib_acl_cpp\samples\sqlite\sqlite_vc2012.vcxproj", "{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}"
+	ProjectSection(ProjectDependencies) = postProject
+		{6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC} = {6EC1F44E-6A6A-48E9-B699-D7E89B63C8DC}
+		{B40213C2-507C-4C7F-A6E1-B850C9BDC27B} = {B40213C2-507C-4C7F-A6E1-B850C9BDC27B}
+		{FE724EF7-3763-4E78-BDF5-BCBC075719FD} = {FE724EF7-3763-4E78-BDF5-BCBC075719FD}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -3452,6 +3459,36 @@ Global
 		{5D57BF9A-188B-4250-991C-74264A146EAE}.Template|Win32.Build.0 = DebugDll|Win32
 		{5D57BF9A-188B-4250-991C-74264A146EAE}.Template|x64.ActiveCfg = DebugDll|x64
 		{5D57BF9A-188B-4250-991C-74264A146EAE}.Template|x64.Build.0 = DebugDll|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|Win32.Build.0 = Debug|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|x64.ActiveCfg = Debug|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Debug|x64.Build.0 = Debug|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Mixed Platforms.ActiveCfg = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Mixed Platforms.Build.0 = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Win32.ActiveCfg = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|Win32.Build.0 = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|x64.ActiveCfg = DebugDll|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.DebugDll|x64.Build.0 = DebugDll|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Win32.ActiveCfg = Release|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|Win32.Build.0 = Release|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|x64.ActiveCfg = Release|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Release|x64.Build.0 = Release|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Mixed Platforms.ActiveCfg = ReleaseDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Mixed Platforms.Build.0 = ReleaseDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Win32.ActiveCfg = ReleaseDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|Win32.Build.0 = ReleaseDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|x64.ActiveCfg = ReleaseDll|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Releasedll|x64.Build.0 = ReleaseDll|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Mixed Platforms.ActiveCfg = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Mixed Platforms.Build.0 = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Win32.ActiveCfg = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|Win32.Build.0 = DebugDll|Win32
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|x64.ActiveCfg = DebugDll|x64
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB}.Template|x64.Build.0 = DebugDll|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3523,6 +3560,7 @@ Global
 		{2495A6D4-777F-48BF-99C0-702E4A11FD23} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
 		{EB430C52-31E4-4018-AD8A-8F56ADAD586A} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
 		{A3F59765-4327-4A1F-82EF-AE0FF3D81503} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
+		{3A8B6C50-A5ED-4665-A5EF-435A6617BCBB} = {FB676B5A-D82C-45CB-9E1F-F3793419DDA9}
 		{640ABB35-FBD3-4D34-A382-9ED8CF3FCE34} = {267F658E-44AF-4080-8577-EFCE99A5E030}
 		{4B58485B-D846-4485-9C5E-7F2304D71701} = {267F658E-44AF-4080-8577-EFCE99A5E030}
 		{9073FA9F-26A1-482C-91D0-876434C3E4EB} = {267F658E-44AF-4080-8577-EFCE99A5E030}

diff --git a/app/Makefile.in b/app/Makefile.in
@@ -42,6 +42,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/gson/Makefile.in b/app/gson/Makefile.in
@@ -42,6 +42,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/gson/test/Makefile.in b/app/gson/test/Makefile.in
@@ -2,16 +2,16 @@ CC      = g++
 
 CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 -Wno-long-long \
--Wpointer-arith -Werror -Wshadow -O3 \
+-Wpointer-arith -Wshadow -O3 \
 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -D_USE_FAST_MACRO
-
+#-Werror
 ###########################################################
 #Check system:
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lz
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -51,6 +51,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/master_dispatch/manager/Makefile.in b/app/master_dispatch/manager/Makefile.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lcrypt -lz
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -42,6 +42,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	CFLAGS += -DLINUX2 -D_REENTRANT
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/master_dispatch/server/Makefile.in b/app/master_dispatch/server/Makefile.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lcrypt -lz
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -41,6 +41,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	CFLAGS += -DLINUX2 -D_REENTRANT
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/master_dispatch/test/server/Makefile.in b/app/master_dispatch/test/server/Makefile.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lcrypt -lz
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -41,6 +41,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	CFLAGS += -DLINUX2 -D_REENTRANT
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv -lz
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/redis_tools/redis_builder/Makefile.in b/app/redis_tools/redis_builder/Makefile.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lz
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -61,6 +61,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/wizard/tmpl/Makefile.in b/app/wizard/tmpl/Makefile.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lz
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -52,6 +52,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/wizard/tmpl/Makefile_fiber.in b/app/wizard/tmpl/Makefile_fiber.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lz -ldl
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -52,6 +52,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/wizard_demo/fiber_chat/Makefile.in b/app/wizard_demo/fiber_chat/Makefile.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lz -ldl
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -52,6 +52,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)

diff --git a/app/wizard_demo/httpd_download/Makefile.in b/app/wizard_demo/httpd_download/Makefile.in
@@ -10,8 +10,8 @@ CFLAGS = -c -g -W -Wall -Wcast-qual -Wcast-align \
 #       Linux, SunOS, Solaris, BSD variants, AIX, HP-UX
 SYSLIB = -lpthread -lz
 CHECKSYSRES = @echo "Unknow system type!";exit 1
-UNIXNAME = $(shell uname -sm)
-OSTYPE = $(shell uname -p)
+UNIXNAME = $(shell uname -s)
+OSTYPE = $(shell uname -m)
 RPATH = linux64
 
 ifeq ($(CC),)
@@ -51,6 +51,20 @@ ifeq ($(findstring Linux, $(UNIXNAME)), Linux)
 	SYSLIB += -lcrypt
 endif
 
+# For MINGW
+ifeq ($(findstring MINGW, $(UNIXNAME)), MINGW)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
+# For MSYS
+ifeq ($(findstring MSYS, $(UNIXNAME)), MSYS)
+	SYSLIB = -lpthread-2 -liconv
+	CFLAGS += -DLINUX2 -DMINGW
+	UNIXTYPE = LINUX
+endif
+
 #Path for SunOS
 ifeq ($(findstring SunOS, $(UNIXNAME)), SunOS)
 	ifeq ($(findstring 86, $(UNIXNAME)), 86)