diff options
| author | Dan Gudmundsson <[email protected]> | 2013-06-04 12:38:31 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2013-06-04 12:38:31 +0200 |
| commit | e83fd8f94aba352b6cc055d2b4cfff007911b6d4 (patch) | |
| tree | 66b22e7e79813d9ec2b0f5a9817a3908682a22ee /erts/emulator/test | |
| parent | e00d6bbbabd7b76c050665fc417e81554a83e341 (diff) | |
| parent | ee23d4b549618044d4a4f800db839483b359cb9f (diff) | |
| download | otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.tar.gz otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.tar.bz2 otp-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.zip | |
Merge branch 'dgud/win32_unicode'
* dgud/win32_unicode:
erts: Windows, convert erlsrv to use widestring
erts: Window start_erl now uses widechars/unicode
Quote windows paths with spaces
Handle space in paths in test Makefiles
erts: Fix windows widestring args and paths in tools
erts: Windows, use widechars for all paths during startup
OTP-11135
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/mtx_SUITE_data/Makefile.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/test/mtx_SUITE_data/Makefile.src b/erts/emulator/test/mtx_SUITE_data/Makefile.src index e65d99e968..04412280c0 100644 --- a/erts/emulator/test/mtx_SUITE_data/Makefile.src +++ b/erts/emulator/test/mtx_SUITE_data/Makefile.src @@ -17,8 +17,8 @@ # %CopyrightEnd% # -include @erts_lib_include_internal_generated@@[email protected] -include @erts_lib_include_internal_generated@@DS@erts_internal.mk +include @erts_lib_make_ethread@ +include @erts_lib_make_internal@ NIF_LIBS = mtx_SUITE@dll@ |