diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2013-06-04 12:38:31 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2013-06-04 12:38:31 +0200 |
| commit | e83fd8f94aba352b6cc055d2b4cfff007911b6d4 (patch) | |
| tree | 66b22e7e79813d9ec2b0f5a9817a3908682a22ee /lib/ic | |
| parent | e00d6bbbabd7b76c050665fc417e81554a83e341 (diff) | |
| parent | ee23d4b549618044d4a4f800db839483b359cb9f (diff) | |
| download | erlang-e83fd8f94aba352b6cc055d2b4cfff007911b6d4.tar.gz | |
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 'lib/ic')
5 files changed, 15 insertions, 15 deletions
diff --git a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src index f3e6fdb67e..8073e3c97d 100644 --- a/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src +++ b/lib/ic/test/c_client_erl_server_SUITE_data/Makefile.src @@ -37,11 +37,11 @@ ERL_INCLUDE = @erl_include@ IC_INCLUDE_PATH = @ic_include_path@ -IC_LIB = @ic_libpath@@DS@@ic_lib@ +IC_LIB = @ic_lib@ ERL_INTERFACE_INCLUDE = @erl_interface_include@ -ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@ -ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@ +ERL_INTERFACE_LIB = @erl_interface_lib@ +ERL_INTERFACE_EILIB = @erl_interface_eilib@ ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@ ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@ diff --git a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src index 0818be01a6..bd8b2a0972 100644 --- a/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src +++ b/lib/ic/test/c_client_erl_server_proto_SUITE_data/Makefile.src @@ -37,11 +37,11 @@ ERL_INCLUDE = @erl_include@ IC_INCLUDE_PATH = @ic_include_path@ -IC_LIB = @ic_libpath@@DS@@ic_lib@ +IC_LIB = @ic_lib@ ERL_INTERFACE_INCLUDE = @erl_interface_include@ -ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@ -ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@ +ERL_INTERFACE_LIB = @erl_interface_lib@ +ERL_INTERFACE_EILIB = @erl_interface_eilib@ ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@ ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@ diff --git a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src index 07b353bc0a..746991b17f 100644 --- a/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src +++ b/lib/ic/test/c_client_erl_server_proto_tmo_SUITE_data/Makefile.src @@ -37,11 +37,11 @@ ERL_INCLUDE = @erl_include@ IC_INCLUDE_PATH = @ic_include_path@ -IC_LIB = @ic_libpath@@DS@@ic_lib@ +IC_LIB = @ic_lib@ ERL_INTERFACE_INCLUDE = @erl_interface_include@ -ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@ -ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@ +ERL_INTERFACE_LIB = @erl_interface_lib@ +ERL_INTERFACE_EILIB = @erl_interface_eilib@ ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@ ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@ diff --git a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src index e190295d70..997d7a4cdc 100644 --- a/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src +++ b/lib/ic/test/erl_client_c_server_SUITE_data/Makefile.src @@ -37,11 +37,11 @@ ERL_INCLUDE = @erl_include@ IC_INCLUDE_PATH = @ic_include_path@ -IC_LIB = @ic_libpath@@DS@@ic_lib@ +IC_LIB = @ic_lib@ ERL_INTERFACE_INCLUDE = @erl_interface_include@ -ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@ -ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@ +ERL_INTERFACE_LIB = @erl_interface_lib@ +ERL_INTERFACE_EILIB = @erl_interface_eilib@ ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@ ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@ diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src index 86917950c9..1213944383 100644 --- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src +++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/Makefile.src @@ -37,11 +37,11 @@ ERL_INCLUDE = @erl_include@ IC_INCLUDE_PATH = @ic_include_path@ -IC_LIB = @ic_libpath@@DS@@ic_lib@ +IC_LIB = @ic_lib@ ERL_INTERFACE_INCLUDE = @erl_interface_include@ -ERL_INTERFACE_LIB = @erl_interface_libpath@@DS@@erl_interface_lib@ -ERL_INTERFACE_EILIB = @erl_interface_libpath@@DS@@erl_interface_eilib@ +ERL_INTERFACE_LIB = @erl_interface_lib@ +ERL_INTERFACE_EILIB = @erl_interface_eilib@ ERL_INTERFACE_THREADLIB = @erl_interface_threadlib@ ERL_INTERFACE_SOCK_LIBS = @erl_interface_sock_libs@ |