diff options
| author | iggy@recycle.(none) <> | 2007-04-23 16:23:32 -0400 |
|---|---|---|
| committer | iggy@recycle.(none) <> | 2007-04-23 16:23:32 -0400 |
| commit | 13b54aa9634fc0a28269e550a15b6f5104859e44 (patch) | |
| tree | c97ca12e6aef03d8d4bfc224962e2081cf8ed86f /win | |
| parent | 658d2127e5d434a3d9919a3193292743b0700f30 (diff) | |
| download | mariadb-git-13b54aa9634fc0a28269e550a15b6f5104859e44.tar.gz | |
Bug#24732 Executables do not include Vista manifests
- Post merge cleanup.
Diffstat (limited to 'win')
| -rw-r--r-- | win/README | 4 | ||||
| -rw-r--r-- | win/configure.js | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/win/README b/win/README index 88677029e0b..1e45b92abb2 100644 --- a/win/README +++ b/win/README @@ -58,7 +58,9 @@ The options right now are MYSQL_SERVER_SUFFIX=<suffix> Server suffix, default none COMPILATION_COMMENT=<comment> Server comment, default "Source distribution" MYSQL_TCP_PORT=<port> Server port, default 3306 - CYBOZU Default character set is UTF8 + CYBOZU Default character set is UTF8 + EMBED_MANIFESTS Embed custom manifests into final exes, otherwise VS + default will be used. So the command line could look like: diff --git a/win/configure.js b/win/configure.js index 7080c457965..7225fff119b 100644 --- a/win/configure.js +++ b/win/configure.js @@ -46,6 +46,7 @@ try case "WITH_PARTITION_STORAGE_ENGINE": case "__NT__": case "CYBOZU": + case "EMBED_MANIFESTS": configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); break; case "MYSQL_SERVER_SUFFIX": |