diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-05-11 09:26:20 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-05-11 09:26:20 +0000 |
| commit | 9194b11f76bbbd8b83408c65f63521ecce4e41e3 (patch) | |
| tree | 12db0cede5cd67b548d85b8365087cfe650afc9a | |
| parent | 7e20f6a413c06bb1dfd987e06d68e7a8c22bd3f3 (diff) | |
| download | ATCD-9194b11f76bbbd8b83408c65f63521ecce4e41e3.tar.gz | |
ChangeLogTag: Tue May 10 09:19:32 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | bin/MakeProjectCreator/config/win32registry.mpb | 6 | ||||
| -rw-r--r-- | examples/Registry/Registry.mpc | 4 | ||||
| -rw-r--r-- | include/makeinclude/platform_mingw32.GNU | 2 | ||||
| -rw-r--r-- | include/makeinclude/wrapper_macros.GNU | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/bin/MakeProjectCreator/config/win32registry.mpb b/bin/MakeProjectCreator/config/win32registry.mpb deleted file mode 100644 index b09b31c399b..00000000000 --- a/bin/MakeProjectCreator/config/win32registry.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -// $Id$ - -feature(win32registry) { - requires += win32registry -} diff --git a/examples/Registry/Registry.mpc b/examples/Registry/Registry.mpc index 2ef83e6a1c7..e2e048f02c0 100644 --- a/examples/Registry/Registry.mpc +++ b/examples/Registry/Registry.mpc @@ -1,14 +1,14 @@ // -*- MPC -*- // $Id$ -project(*iterator) : aceexe, win32registry { +project(*iterator) : aceexe, winregistry { exename = iterator Source_Files { test_registry_iterator.cpp } } -project(*update) : aceexe, win32registry { +project(*update) : aceexe, winregistry { exename = update Source_Files { diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU index c096198afe4..a4c8add7bc9 100644 --- a/include/makeinclude/platform_mingw32.GNU +++ b/include/makeinclude/platform_mingw32.GNU @@ -44,7 +44,7 @@ rwho = 0 # MinGW has wfmo and registry wfmo = 1 -win32registry = 1 +winregistry = 1 # Disable auto-import warnings. The MingW linker has a problem with imports # See https://sourceforge.net/tracker/?func=detail&atid=102435&aid=683455&group_id=2435 diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU index 6e5c457a6cb..fb1258418d4 100644 --- a/include/makeinclude/wrapper_macros.GNU +++ b/include/makeinclude/wrapper_macros.GNU @@ -78,7 +78,7 @@ # to append to the name - it should have a leading '.' - # else it defaults to .ACE_MAJOR.ACE_MINOR.ACE_BETA. # wfmo Build with wfmo support (Win32 only) -# win32registry Build with registry support (Win32 only) +# winregistry Build with windows registry support (Win32 only) # # Usually, users do not need to be concerned with make targets. # Just enter "make" on the command line to build. A few notable @@ -783,8 +783,8 @@ endif # If not explicitly is set that we have wfmo, assume we don't have it. wfmo ?= 0 -# If not explicitly is set that we have win32registry, assume we don't have it. -win32registry ?= 0 +# If not explicitly is set that we have winregistry, assume we don't have it. +winregistry ?= 0 # In MPC, these are now features that are enabled by default. ace_other ?= 1 |