diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-25 13:41:07 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2003-01-25 13:41:07 +0000 |
commit | 61cbf379d39095aba92f696e3719ed9214a139e6 (patch) | |
tree | 957b92a51ccc9cc1a45f87fb307b88977c5d589d | |
parent | d35a0b105360d969208a80c42eeab22f8be92a8f (diff) | |
download | ATCD-61cbf379d39095aba92f696e3719ed9214a139e6.tar.gz |
ChangeLogTag: Sat Jan 25 13:34:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r-- | ACE-INSTALL.html | 12 | ||||
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
-rw-r--r-- | include/makeinclude/platform_gnuwin32_common.GNU | 11 | ||||
-rw-r--r-- | include/makeinclude/platform_mingw32.GNU | 10 |
5 files changed, 18 insertions, 33 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html index 02aeaa0c946..d60f7901006 100644 --- a/ACE-INSTALL.html +++ b/ACE-INSTALL.html @@ -1587,18 +1587,6 @@ The steps we followed in the build are: source tree as <TT>$ACE_ROOT</TT>. <BR><BR> - <LI> Add a <TT>MINGW_BASE</TT> environment variable pointing to the - root of your Mingw instalation. Following the above example, - set: - - <blockquote><code><pre> - % export MINGW_BASE=c:/mingw32 - </pre></code></blockquote> - - Again, use Mingw syntax and not cygwin syntax for the directory - specification. - <BR><BR> - <LI> Create a file called <TT>config.h</TT> in the <TT>$ACE_ROOT/ace</TT> directory that contains: diff --git a/ChangeLog b/ChangeLog index bbb5400b8ca..74eb80d8aa5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Sat Jan 25 13:39:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + * include/makeinclude/platform_mingw32.GNU: + * include/makeinclude/platform_gnuwin32_common.GNU: + Removed the usage of MINGW_BASE. This is not needed for using MingW. + Thankx to Viktor Ransmayr <viktor.ransmayr@t-online.de> for + confirming that this is not needed. + Fri Jan 24 07:54:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index bbb5400b8ca..74eb80d8aa5 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Sat Jan 25 13:39:23 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE-INSTALL.html: + * include/makeinclude/platform_mingw32.GNU: + * include/makeinclude/platform_gnuwin32_common.GNU: + Removed the usage of MINGW_BASE. This is not needed for using MingW. + Thankx to Viktor Ransmayr <viktor.ransmayr@t-online.de> for + confirming that this is not needed. + Fri Jan 24 07:54:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * ace/OS.h: diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU index 9a5c936c4ea..35d7d8a259f 100644 --- a/include/makeinclude/platform_gnuwin32_common.GNU +++ b/include/makeinclude/platform_gnuwin32_common.GNU @@ -48,17 +48,6 @@ ifeq ($(threads),0) CFLAGS += -DACE_MT_SAFE=0 endif # threads -ifeq ($(mingw32),1) -CFLAGS += \ - -I$(MINGW_BASE)/mingw32/include \ - -I$(MINGW_BASE)/w32api/include \ - -I$(MINGW_BASE)/include -LDFLAGS += \ - -L$(MINGW_BASE)/mingw32/lib \ - -L$(MINGW_BASE)/w32api/lib \ - -L$(MINGW_BASE)/lib -endif - ifeq ($(debug),0) CFLAGS += -DNDEBUG endif diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU index 8ab17f325d1..66dd974e3cb 100644 --- a/include/makeinclude/platform_mingw32.GNU +++ b/include/makeinclude/platform_mingw32.GNU @@ -40,16 +40,6 @@ TCPU = pentiumpro #TCPU = i486 #TCPU = i386 -# Define here mingw32 instalation location. -# These asumes no fancy hierachy, just all packages above unpacked on -# the same base directory. -# Optionally, you can define it as an environment variable, or set it -# on your platform_macros.GNU before including this file. - -ifndef MINGW_BASE - MINGW_BASE = c:/live/local/mingw32 -endif - # MingW doesn't allow to add the version number of ACE to the dll name # because fe ace.dll.5.2.3 isn't a valid dll name SONAME= |