Attention is currently required from: flichtenheld, plaisthos.
Hello plaisthos, flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1197?usp=email
to review the following change.
Change subject: add building of openvpnsrvmsg.dll from eventmsg.mc to
autoconf/mingw builds
......................................................................
add building of openvpnsrvmsg.dll from eventmsg.mc to autoconf/mingw builds
commit 06919a60ae61 introduces .mc files that need to be compiled to
.h and .bin by the windows "mc.exe" tool, and from there into a new
.dll
Add logic to configure.ac to find the "windmc" binary in the linux or
mingw variants, add rules to src/openvpnserv/Makefile.am so make knows
what to do.
Libtool is getting in the way when "openvpnsrvmsg.dll" is created as
anything listed in ...BIN or ...LIB, so decare it as "DATA" and make
the necessary rules explicit.
See also:
https://learn.microsoft.com/en-us/cpp/build/creating-a-resource-only-dll?view=msvc-170
Change-Id: I071e8190dac28f429257b8af1c6f9e68f8896bc0
Signed-off-by: Gert Doering <[email protected]>
---
M configure.ac
M src/openvpnserv/Makefile.am
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/97/1197/1
diff --git a/configure.ac b/configure.ac
index 7059871..38b14a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,6 +441,7 @@
AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool])
AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool])
AC_DEFINE_UNQUOTED([SYSTEMD_ASK_PASSWORD_PATH], ["$SYSTEMD_ASK_PASSWORD"],
[Path to systemd-ask-password tool])
+AC_CHECK_TOOLS([WINDMC], [windmc mc.exe],[no])
#
# man page generation - based on python-docutils
diff --git a/src/openvpnserv/Makefile.am b/src/openvpnserv/Makefile.am
index ef5f3f3..e66ece9 100644
--- a/src/openvpnserv/Makefile.am
+++ b/src/openvpnserv/Makefile.am
@@ -28,6 +28,8 @@
openvpnserv_LDADD = \
-ladvapi32 -luserenv -liphlpapi -lfwpuclnt -lrpcrt4 \
-lshlwapi -lnetapi32 -lws2_32 -lntdll -lole32
+noinst_DATA = \
+ MSG00409.bin eventmsg.h eventmsg.rc openvpnservmsg.dll
endif
openvpnserv_SOURCES = \
@@ -37,3 +39,14 @@
validate.c validate.h \
$(top_srcdir)/src/openvpn/wfp_block.c
$(top_srcdir)/src/openvpn/wfp_block.h \
openvpnserv_resources.rc
+
+openvpnservmsg.dll: eventmsg.o
+ $(CC) -shared -Wl,--entry=0 -nostdlib -nostartfiles -o
openvpnservmsg.dll eventmsg.o
+
+eventmsg.o: eventmsg.rc
+
+BUILT_SOURCES = \
+ eventmsg.h
+
+eventmsg.h: eventmsg.mc
+ $(WINDMC) -U eventmsg.mc
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1197?usp=email
To unsubscribe, or for help writing mail filters, visit
http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I071e8190dac28f429257b8af1c6f9e68f8896bc0
Gerrit-Change-Number: 1197
Gerrit-PatchSet: 1
Gerrit-Owner: cron2 <[email protected]>
Gerrit-Reviewer: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
