diff options
| author | Alon Bar-Lev <alon.barlev@gmail.com> | 2012-03-24 22:31:10 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-06-29 10:07:23 +0200 |
| commit | 74370aa89df9285a95084616e9c2d3c8464760b9 (patch) | |
| tree | a0f62d0a847e9163c9f7e08a8d89effc62ed9840 /src/openvpn/Makefile.am | |
| parent | 5a57e201223f7265af0a56859b00a594b0d98f5b (diff) | |
| download | openvpn-74370aa89df9285a95084616e9c2d3c8464760b9.tar.gz openvpn-74370aa89df9285a95084616e9c2d3c8464760b9.tar.xz openvpn-74370aa89df9285a95084616e9c2d3c8464760b9.zip | |
cleanup: windows: convert argv (UCS-2 to UTF-8) at earliest
Discussed at [1].
Use wmain under windows, drop the custom parsing and shell32 linkage.
There is no need for gc magic as this allocation is static.
[1] http://permalink.gmane.org/gmane.network.openvpn.devel/5433
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Message-Id: 1332621070-28464-1-git-send-email-alon.barlev@gmail.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/6063
Tested-by: Samuli Seppänen <samuli@openvpn.net>
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/Makefile.am')
| -rw-r--r-- | src/openvpn/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am index d090d67..5d38628 100644 --- a/src/openvpn/Makefile.am +++ b/src/openvpn/Makefile.am @@ -27,6 +27,10 @@ AM_CFLAGS = \ $(OPTIONAL_CRYPTO_CFLAGS) \ $(OPTIONAL_LZO_CFLAGS) \ $(OPTIONAL_PKCS11_HELPER_CFLAGS) +if WIN32 +# we want unicode entry point but not the macro +AM_CFLAGS += -municode -UUNICODE +endif sbin_PROGRAMS = openvpn @@ -118,5 +122,5 @@ openvpn_LDADD = \ $(OPTIONAL_DL_LIBS) if WIN32 openvpn_SOURCES += openvpn_win32_resources.rc -openvpn_LDADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm -lshell32 +openvpn_LDADD += -lgdi32 -lws2_32 -lwininet -lcrypt32 -liphlpapi -lwinmm endif |