From 38ec4689f5234f2b48fe6baef39bd4b36fe4a7eb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 6 Sep 2009 20:30:12 +0000
Subject: [PATCH] Work with MINGW compiler. No need to have cygwin1.dll.
---
build/exe/doliwamp/Makefile | 4 +---
build/exe/doliwamp/UsedPort.cpp | 2 +-
build/exe/doliwamp/UsedPort.exe | Bin 21399 -> 21399 bytes
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/build/exe/doliwamp/Makefile b/build/exe/doliwamp/Makefile
index c01bfbef804..130397a05a0 100644
--- a/build/exe/doliwamp/Makefile
+++ b/build/exe/doliwamp/Makefile
@@ -50,8 +50,6 @@ COPTIONS=-O3
endif
ifeq "$(OS)" "Windows_NT"
# wsock32 required only if _WIN32 defined in source code and use WSA* functions
-# wsock32 of CYGWIN need cygwin1.dll to work
-#LOPTIONS=-lwsock32 -Bstatic
LOPTIONS=-Bstatic
endif
ifeq "$(MACHTYPE)" "sparc"
@@ -105,7 +103,7 @@ endif
#-----------------
ifeq "$(OS)" "Windows_NT"
RM = rm -f
-CFLAGS = $(COPTIONS) $(INCLUDES) -Ic:/langages/gcc/i386-mingw32/include/windows32
+CFLAGS = $(COPTIONS) $(INCLUDES)
else
RM = rm -f
CFLAGS = $(COPTIONS) $(INCLUDES)
diff --git a/build/exe/doliwamp/UsedPort.cpp b/build/exe/doliwamp/UsedPort.cpp
index f14e854b9a5..830f6456070 100644
--- a/build/exe/doliwamp/UsedPort.cpp
+++ b/build/exe/doliwamp/UsedPort.cpp
@@ -3,7 +3,7 @@
//---------------------------------------------------------------------------
// Tested with :
// GCC CYGWIN 3.4.4 (May need cygwin1.dll, depending on functions used)
-// MINGW 3.4.5
+// GCC MINGW 3.4.5
// Not tested with:
// VC++ 4.0.0
// GCC Linux 3.4.4
diff --git a/build/exe/doliwamp/UsedPort.exe b/build/exe/doliwamp/UsedPort.exe
index 19d13155a3e43e60e2f44a29d267990cd9750175..c851f9c635d052d920bc315f217ea167b414158e 100644
GIT binary patch
delta 21
dcmbQfoN@Yc#t9uvi=-!Z`7t@{+jwhl5CCCq30VLD
delta 21
dcmbQfoN@Yc#t9uv|HLPD`7zDewei;8AOL5j3JCxJ
--
GitLab