diff options
| author | knielsen@mysql.com <> | 2006-03-24 22:50:56 +0100 |
|---|---|---|
| committer | knielsen@mysql.com <> | 2006-03-24 22:50:56 +0100 |
| commit | bc6628d27fbf4bcc12682f159742e5bc70e5c35d (patch) | |
| tree | 4a3cb807ddfab7cd04cb6caf42623f824843f884 /sql | |
| parent | 443ac64226b610229b62499eecfc58ea479843a6 (diff) | |
| download | mariadb-git-bc6628d27fbf4bcc12682f159742e5bc70e5c35d.tar.gz | |
Some changes to make it possible to build for Windows with CMake from
a normal 'make dist' source .tar.gz.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Makefile.am | 3 | ||||
| -rw-r--r-- | sql/cmakelists.txt | 10 | ||||
| -rw-r--r-- | sql/message.mc | 8 |
3 files changed, 16 insertions, 5 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index b0824110792..52a553c719c 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -124,7 +124,8 @@ DEFS = -DMYSQL_SERVER \ @DEFS@ BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h -EXTRA_DIST = udf_example.cc handlerton-win.cc $(BUILT_SOURCES) +EXTRA_DIST = udf_example.cc handlerton-win.cc $(BUILT_SOURCES) \ + nt_servc.cc nt_servc.h message.mc cmakelists.txt CLEANFILES = lex_hash.h sql_yacc.cc sql_yacc.h AM_YFLAGS = -d diff --git a/sql/cmakelists.txt b/sql/cmakelists.txt index d3c6c38472a..b3509904a77 100644 --- a/sql/cmakelists.txt +++ b/sql/cmakelists.txt @@ -67,10 +67,10 @@ ADD_CUSTOM_COMMAND( # Windows message file ADD_CUSTOM_COMMAND( - SOURCE ../VC++Files/sql/message.mc + SOURCE message.mc OUTPUT message.rc message.h - COMMAND mc ARGS ../VC++Files/sql/message.mc - DEPENDS ../VC++Files/sql/message.mc) + COMMAND mc ARGS message.mc + DEPENDS message.mc) # MySql_version.h. #ADD_CUSTOM_COMMAND( @@ -84,7 +84,9 @@ ADD_CUSTOM_COMMAND( SOURCE ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in OUTPUT ${PROJECT_SOURCE_DIR}/sql/handlerton.cc COMMAND cscript.exe ${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data - DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in) + DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in + ${PROJECT_SOURCE_DIR}/win/configure.data + ${PROJECT_SOURCE_DIR}/win/config-handlerton.js) # Error file #GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION) diff --git a/sql/message.mc b/sql/message.mc new file mode 100644 index 00000000000..a1a7c8cff7e --- /dev/null +++ b/sql/message.mc @@ -0,0 +1,8 @@ +MessageId = 100 +Severity = Error +Facility = Application +SymbolicName = MSG_DEFAULT +Language = English +%1For more information, see Help and Support Center at http://www.mysql.com. + + |