You've already forked openvpn-gui
mirror of
https://github.com/OpenVPN/openvpn-gui.git
synced 2025-11-26 14:08:00 +08:00
use automake in build
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Edited to not use libtool and implicit automake rule to build resource object
This commit is contained in:
Alon Bar-Lev
31
.gitignore
vendored
31
.gitignore
vendored
@@ -1,11 +1,30 @@
|
||||
*.[oa]
|
||||
*.exe
|
||||
*.obj
|
||||
*.so
|
||||
*~
|
||||
*.idb
|
||||
*.suo
|
||||
*.ncb
|
||||
*.vcproj.*
|
||||
*.log
|
||||
*.tar.gz
|
||||
|
||||
.deps
|
||||
Makefile
|
||||
Makefile.in
|
||||
aclocal.m4
|
||||
autom4te.cache/
|
||||
config.h*
|
||||
autodefs.h
|
||||
autom4te.cache
|
||||
config.guess
|
||||
config.h
|
||||
config.h.in
|
||||
config.log
|
||||
config.status
|
||||
config.sub
|
||||
configure
|
||||
*.tar.gz
|
||||
*.o
|
||||
*.exe
|
||||
*~
|
||||
configure.h
|
||||
depcomp
|
||||
stamp-h1
|
||||
install-sh
|
||||
missing
|
||||
|
||||
95
Makefile.am
Normal file
95
Makefile.am
Normal file
@@ -0,0 +1,95 @@
|
||||
# OpenVPN-GUI -- A Windows GUI for OpenVPN.
|
||||
#
|
||||
# Copyright (C) 2004 Mathias Sundman <mathias@nilings.se>
|
||||
# 2010 Heiko Hund <heikoh@users.sf.net>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program (see the file COPYING included with this
|
||||
# distribution); if not, write to the Free Software Foundation, Inc.,
|
||||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
RCCOMPILE = $(WINDRES) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||
$(AM_CPPFLAGS) $(CPPFLAGS)
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign 1.9
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
config.log config.status \
|
||||
$(srcdir)/Makefile.in $(srcdir)/configure \
|
||||
$(srcdir)/config.h.in $(srcdir)/config.h.in~\
|
||||
$(srcdir)/install-sh $(srcdir)/missing \
|
||||
$(srcdir)/depcomp $(srcdir)/aclocal.m4 \
|
||||
$(srcdir)/config.guess $(srcdir)/config.sub
|
||||
|
||||
bin_PROGRAMS = openvpn-gui
|
||||
|
||||
dist_doc_DATA = \
|
||||
COPYRIGHT.GPL \
|
||||
COPYING
|
||||
|
||||
INCLUDES = $(OPENSSL_CRYPTO_CFLAGS)
|
||||
AM_CPPFLAGS = -D_UNICODE
|
||||
AM_CFLAGS = -municode
|
||||
|
||||
openvpn_gui_RESOURCES = \
|
||||
res/openvpn-gui-res.rc \
|
||||
res/openvpn-gui-res-de.rc \
|
||||
res/openvpn-gui-res-dk.rc \
|
||||
res/openvpn-gui-res-en.rc \
|
||||
res/openvpn-gui-res-es.rc \
|
||||
res/openvpn-gui-res-fi.rc \
|
||||
res/openvpn-gui-res-fr.rc \
|
||||
res/openvpn-gui-res-it.rc \
|
||||
res/openvpn-gui-res-jp.rc \
|
||||
res/openvpn-gui-res-nl.rc \
|
||||
res/openvpn-gui-res-no.rc \
|
||||
res/openvpn-gui-res-pl.rc \
|
||||
res/openvpn-gui-res-pt.rc \
|
||||
res/openvpn-gui-res-se.rc \
|
||||
res/openvpn-gui-res-tr.rc \
|
||||
res/connected.ico \
|
||||
res/connecting.ico \
|
||||
res/disconnected.ico \
|
||||
res/openvpn-gui.ico \
|
||||
res/reconnecting.ico \
|
||||
res/openvpn-gui.manifest
|
||||
|
||||
EXTRA_DIST = $(openvpn_gui_RESOURCES)
|
||||
|
||||
openvpn_gui_SOURCES = \
|
||||
main.c main.h \
|
||||
openvpn.c openvpn.h \
|
||||
localization.c localization.h \
|
||||
tray.c tray.h \
|
||||
viewlog.c viewlog.h \
|
||||
service.c service.h \
|
||||
options.c options.h \
|
||||
passphrase.c passphrase.h \
|
||||
proxy.c proxy.h \
|
||||
registry.c registry.h \
|
||||
scripts.c scripts.h \
|
||||
manage.c manage.h \
|
||||
openvpn_config.c \
|
||||
openvpn_config.h \
|
||||
chartable.h \
|
||||
openvpn-gui-res.h
|
||||
|
||||
openvpn_gui_LDFLAGS = -mwindows
|
||||
openvpn_gui_LDADD = \
|
||||
openvpn-gui-res.o \
|
||||
$(OPENSSL_CRYPTO_LIBS) \
|
||||
-lws2_32 \
|
||||
-lcomctl32
|
||||
|
||||
openvpn-gui-res.o: $(openvpn_gui_RESOURCES) $(srcdir)/openvpn-gui-res.h
|
||||
$(RCCOMPILE) -i $< -o $@
|
||||
57
Makefile.in
57
Makefile.in
@@ -1,57 +0,0 @@
|
||||
SNAPSHOT = $(shell test -f SNAPSHOT && cat SNAPSHOT)
|
||||
VERSION = @PACKAGE_VERSION@$(SNAPSHOT)
|
||||
EXE = @PACKAGE_TARNAME@$(SNAPSHOT).exe
|
||||
|
||||
CC = @CC@
|
||||
WINDRES = @WINDRES@
|
||||
|
||||
LDFLAGS = @CRYPTO_LDFLAGS@ @LDFLAGS@
|
||||
LIBS = @CRYPTO_LIBS@ @LIBS@
|
||||
CFLAGS = @CRYPTO_CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ -DUNICODE -D_UNICODE
|
||||
CFLAGS += -W -Wall -Wno-unused-parameter -pedantic
|
||||
|
||||
OBJS = main.o tray.o openvpn.o viewlog.o \
|
||||
service.o options.o passphrase.o proxy.o registry.o manage.o \
|
||||
openvpn_config.o scripts.o localization.o openvpn-gui-res.o
|
||||
|
||||
SOURCES = main.c main.h openvpn.c openvpn.h localization.c localization.h \
|
||||
tray.c tray.h viewlog.c viewlog.h service.c service.h \
|
||||
options.c options.h passphrase.c passphrase.h proxy.c proxy.h \
|
||||
registry.c registry.h scripts.c scripts.h manage.c manage.h \
|
||||
openvpn_config.c openvpn_config.h res/openvpn-gui.manifest \
|
||||
chartable.h openvpn-gui-res.h res/openvpn-gui-res*.rc
|
||||
|
||||
EXTRA = res/*.ico acinclude.m4 Makefile.in aclocal.m4 config.h.in configure \
|
||||
configure.ac config.guess config.sub install-sh \
|
||||
OpenVPN\ GUI\ ReadMe.txt changes.txt COPYING COPYRIGHT.GPL
|
||||
|
||||
all : ${OBJS}
|
||||
${CC} $(CFLAGS) $(LDFLAGS) -o $(EXE) ${OBJS} ${LIBS}
|
||||
|
||||
%.o : %.c %.h
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
|
||||
openvpn-gui-res.o : openvpn-gui-res.h res/*.rc res/*.ico res/*.manifest
|
||||
$(WINDRES) -I. -i res/openvpn-gui-res.rc -o openvpn-gui-res.o
|
||||
|
||||
dist:
|
||||
rm -rf @PACKAGE_TARNAME@-*/
|
||||
mkdir @PACKAGE_TARNAME@-$(VERSION)
|
||||
cp --parents $(SOURCES) $(EXTRA) @PACKAGE_TARNAME@-$(VERSION)
|
||||
test ! -f SNAPSHOT || { \
|
||||
cd openvpn-gui-$(VERSION); \
|
||||
cp ../SNAPSHOT .; \
|
||||
sed -i -e 's/\[MAJOR_VERSION.MINOR_VERSION.RELEASE\]/[$(subst -,,$(SNAPSHOT))]/' configure.ac; \
|
||||
autoconf; \
|
||||
cd -; \
|
||||
}
|
||||
tar -czf @PACKAGE_TARNAME@-$(VERSION).tar.gz @PACKAGE_TARNAME@-$(VERSION)
|
||||
rm -rf @PACKAGE_TARNAME@-$(VERSION)
|
||||
|
||||
snapshot:
|
||||
echo "-`date +%Y%m%d%H%M%S`" > SNAPSHOT
|
||||
$(MAKE) dist
|
||||
rm -f SNAPSHOT
|
||||
|
||||
clean :
|
||||
rm -f *.o *.exe
|
||||
87
acinclude.m4
87
acinclude.m4
@@ -1,87 +0,0 @@
|
||||
AC_DEFUN([AX_ASSERT_LIB], [
|
||||
AC_CHECK_HEADER([$2], , [AC_MSG_FAILURE([$1 library headers could not be found.])], [$5])
|
||||
AC_MSG_CHECKING([if $1 library is available])
|
||||
LIBS="-l$1 $LIBS"
|
||||
AC_TRY_LINK(
|
||||
[$5
|
||||
#include <$2>], [$3], [AC_MSG_RESULT([yes])],
|
||||
[AC_MSG_RESULT([no]); AC_MSG_FAILURE([$4])]
|
||||
)
|
||||
])
|
||||
|
||||
|
||||
AC_DEFUN([AX_SEARCH_LIB], [
|
||||
_ldflags="$LDFLAGS"
|
||||
_cppflags="$CPPFLAGS"
|
||||
_libs="$LIBS"
|
||||
|
||||
AC_ARG_WITH(m4_translit([$1], [_], [-]),
|
||||
[AS_HELP_STRING([--with-]m4_translit([$1], [_], [-])[=DIR],
|
||||
[search for $1 files in DIR/lib and DIR/include])],
|
||||
[dnl
|
||||
if test -d $withval
|
||||
then
|
||||
LDFLAGS="-L$withval/lib $_ldflags"
|
||||
CPPFLAGS="-I$withval/include $_cppflags"
|
||||
AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_LDFLAGS], [-L$withval/lib])
|
||||
AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_CPPFLAGS], [-I$withval/include])
|
||||
else
|
||||
AC_MSG_ERROR([$withval: No such directory])
|
||||
fi
|
||||
]
|
||||
)
|
||||
|
||||
AC_ARG_WITH(m4_translit([$1], [_], [-])[-lib],
|
||||
[AS_HELP_STRING([--with-]m4_translit([$1], [_], [-])[-lib=DIR],
|
||||
[search for $1 library in DIR])],
|
||||
[dnl
|
||||
if test -d $withval
|
||||
then
|
||||
LDFLAGS="-L$withval $_ldflags"
|
||||
AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_LDFLAGS], [-L$withval])
|
||||
else
|
||||
AC_MSG_ERROR([$withval: No such directory])
|
||||
fi
|
||||
]
|
||||
)
|
||||
|
||||
AC_ARG_WITH(m4_translit([$1], [_], [-])[-includes],
|
||||
[AS_HELP_STRING([--with-]m4_translit([$1], [_], [-])[-includes=DIR],
|
||||
[search for $1 library header files in DIR])],
|
||||
[dnl
|
||||
if test -d $withval
|
||||
then
|
||||
CPPFLAGS="-I$withval $_cppflags"
|
||||
AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_CPPFLAGS], [-I$withval])
|
||||
else
|
||||
AC_MSG_ERROR([$withval: No such directory])
|
||||
fi
|
||||
]
|
||||
)
|
||||
|
||||
AC_CHECK_HEADER([$4], , [AC_MSG_FAILURE([$1 library headers could not be found. You may want to specify a search path using `--with-]m4_translit([$1], [_], [-])[-includes'.])])
|
||||
|
||||
_result=no
|
||||
for lib in $1 $2; do
|
||||
AC_MSG_CHECKING([if $lib library is available])
|
||||
LIBS="-l$lib $3 $_libs"
|
||||
AC_TRY_LINK([#include <$4>], [$5], [
|
||||
AC_SUBST(m4_translit([$1], [a-z-], [A-Z_])[_LIBS], [-l$lib])
|
||||
AC_MSG_RESULT([yes])
|
||||
_result=yes
|
||||
break
|
||||
], [AC_MSG_RESULT([no])])
|
||||
done
|
||||
if test "$_result" = "no"; then
|
||||
AC_MSG_FAILURE([$1 library could not be found. You may want to specify a search path using `--with-]m4_translit([$1], [_], [-])[[[-lib]]'.])
|
||||
fi
|
||||
|
||||
CPPFLAGS="$_cppflags"
|
||||
LDFLAGS="$_ldflags"
|
||||
LIBS="$_libs"
|
||||
|
||||
_result=
|
||||
_cppflags=
|
||||
_ldflags=
|
||||
_libs=
|
||||
])
|
||||
1502
config.guess
vendored
1502
config.guess
vendored
File diff suppressed because it is too large
Load Diff
1714
config.sub
vendored
1714
config.sub
vendored
File diff suppressed because it is too large
Load Diff
107
configure.ac
107
configure.ac
@@ -1,54 +1,75 @@
|
||||
dnl OpenVPN-GUI -- A Windows GUI for OpenVPN.
|
||||
dnl
|
||||
dnl Copyright (C) 2004 Mathias Sundman <mathias@nilings.se>
|
||||
dnl 2010 Heiko Hund <heikoh@users.sf.net>
|
||||
dnl
|
||||
dnl This program is free software; you can redistribute it and/or modify
|
||||
dnl it under the terms of the GNU General Public License as published by
|
||||
dnl the Free Software Foundation; either version 2 of the License, or
|
||||
dnl (at your option) any later version.
|
||||
dnl
|
||||
dnl This program is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
dnl GNU General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU General Public License
|
||||
dnl along with this program (see the file COPYING included with this
|
||||
dnl distribution); if not, write to the Free Software Foundation, Inc.,
|
||||
dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
define(MAJOR_VERSION, 1)
|
||||
define(MINOR_VERSION, 0)
|
||||
define(RELEASE, 3)
|
||||
|
||||
AC_PREREQ([2.53])
|
||||
AC_INIT([OpenVPN GUI], [MAJOR_VERSION.MINOR_VERSION.RELEASE],
|
||||
[openvpn-devel@lists.sourceforge.net], [openvpn-gui],
|
||||
[http://openvpn-gui.sf.net])
|
||||
AC_CONFIG_SRCDIR([chartable.h])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
AC_DEFINE(PACKAGE_MAJOR_VERSION, [MAJOR_VERSION],
|
||||
[Define to the package major version.])
|
||||
AC_DEFINE(PACKAGE_MINOR_VERSION, [MINOR_VERSION],
|
||||
[Define to the package minor version.])
|
||||
AC_DEFINE(PACKAGE_RELEASE, [RELEASE],
|
||||
[Define to the package release number.])
|
||||
|
||||
AC_PROG_CC_C99
|
||||
|
||||
AC_PREREQ(2.59)
|
||||
define([VERSION_MAJOR], [1])
|
||||
define([VERSION_MINOR], [0])
|
||||
define([VERSION_FIX], [3])
|
||||
AC_INIT([OpenVPN GUI],[VERSION_MAJOR.VERSION_MINOR.VERSION_FIX],[openvpn-devel@lists.sourceforge.net],[openvpn-gui],[http://openvpn-gui.sf.net])
|
||||
AC_DEFINE([PACKAGE_VERSION_RESOURCE], [VERSION_MAJOR,VERSION_MINOR,VERSION_FIX,0], [Version in windows resource format])
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
AC_CONFIG_SRCDIR([main.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_CANONICAL_HOST
|
||||
case $host in
|
||||
*-cygwin)
|
||||
# Build a native Windows binary
|
||||
CFLAGS="$CFLAGS -mno-cygwin"
|
||||
CPPFLAGS="$CPPFLAGS -mno-cygwin"
|
||||
LDFLAGS="$LDFLAGS -mno-cygwin"
|
||||
;;
|
||||
esac
|
||||
LDFLAGS="$LDFLAGS -mwindows"
|
||||
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
AC_PROG_CC_C99
|
||||
AC_CHECK_TOOL([WINDRES], [windres])
|
||||
|
||||
AC_CHECK_HEADER([windows.h], ,
|
||||
[AC_MSG_FAILURE([Target system must be Windows])])
|
||||
AC_ARG_ENABLE(
|
||||
[distonly],
|
||||
[AS_HELP_STRING([--enable-distonly], [enable distribute only mode @<:@default=no@:>@])],
|
||||
,
|
||||
[enable_distonly="no"]
|
||||
)
|
||||
|
||||
AX_ASSERT_LIB([wininet], [wininet.h],
|
||||
[DWORD s; InternetQueryOption(NULL, INTERNET_OPTION_PROXY, NULL, &s)],
|
||||
[Make sure you're building with a recent WIN API.], [#include <windows.h>])
|
||||
case "$host" in
|
||||
*-mingw*)
|
||||
CPPFLAGS="${CPPFLAGS} -DWIN32_LEAN_AND_MEAN"
|
||||
CPPFLAGS="${CPPFLAGS} -D_WIN32_WINNT=NTDDI_WINXP"
|
||||
;;
|
||||
*)
|
||||
test "${enable_distonly}" = "no" && AC_MSG_ERROR([This project is supported for windows only.])
|
||||
;;
|
||||
esac
|
||||
|
||||
AX_ASSERT_LIB([comctl32], [prsht.h],
|
||||
[PROPSHEETHEADER psh; PropertySheet(&psh)],
|
||||
[Make sure you're building with a recent WIN API.], [#include <windows.h>])
|
||||
PKG_PROG_PKG_CONFIG
|
||||
AC_PROG_CPP
|
||||
AC_PROG_INSTALL
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
|
||||
AX_ASSERT_LIB([ws2_32], [winsock2.h],
|
||||
[WSADATA wsaData; WSAStartup(MAKEWORD(2, 2), &wsaData)],
|
||||
[Make sure you're building with a recent WIN API.], [#include <windows.h>])
|
||||
PKG_CHECK_MODULES(
|
||||
[OPENSSL_CRYPTO],
|
||||
[libcrypto >= 0.9.6],
|
||||
,
|
||||
[AC_CHECK_LIB(
|
||||
[crypto],
|
||||
[RSA_new],
|
||||
[OPENSSL_CRYPTO_LIBS="-lcrypto"],
|
||||
[test "${enable_distonly}" = "no" && AC_MSG_ERROR([Cannot find OpenSSL library])]
|
||||
)]
|
||||
)
|
||||
|
||||
AX_SEARCH_LIB([crypto], [cryptoeay32 eay32 crypto], [-lgdi32],
|
||||
[openssl/pkcs12.h], [EVP_PKEY *k = EVP_PKEY_new()])
|
||||
test "${GCC}" = "yes" && CFLAGS="${CFLAGS} -pedantic -Wall -Wextra"
|
||||
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
520
install-sh
520
install-sh
@@ -1,520 +0,0 @@
|
||||
#!/bin/sh
|
||||
# install - install a program, script, or datafile
|
||||
|
||||
scriptversion=2009-04-28.21; # UTC
|
||||
|
||||
# This originates from X11R5 (mit/util/scripts/install.sh), which was
|
||||
# later released in X11R6 (xc/config/util/install.sh) with the
|
||||
# following copyright and license.
|
||||
#
|
||||
# Copyright (C) 1994 X Consortium
|
||||
#
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
# of this software and associated documentation files (the "Software"), to
|
||||
# deal in the Software without restriction, including without limitation the
|
||||
# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
# sell copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included in
|
||||
# all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||
# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
|
||||
# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
#
|
||||
# Except as contained in this notice, the name of the X Consortium shall not
|
||||
# be used in advertising or otherwise to promote the sale, use or other deal-
|
||||
# ings in this Software without prior written authorization from the X Consor-
|
||||
# tium.
|
||||
#
|
||||
#
|
||||
# FSF changes to this file are in the public domain.
|
||||
#
|
||||
# Calling this script install-sh is preferred over install.sh, to prevent
|
||||
# `make' implicit rules from creating a file called install from it
|
||||
# when there is no Makefile.
|
||||
#
|
||||
# This script is compatible with the BSD install script, but was written
|
||||
# from scratch.
|
||||
|
||||
nl='
|
||||
'
|
||||
IFS=" "" $nl"
|
||||
|
||||
# set DOITPROG to echo to test this script
|
||||
|
||||
# Don't use :- since 4.3BSD and earlier shells don't like it.
|
||||
doit=${DOITPROG-}
|
||||
if test -z "$doit"; then
|
||||
doit_exec=exec
|
||||
else
|
||||
doit_exec=$doit
|
||||
fi
|
||||
|
||||
# Put in absolute file names if you don't have them in your path;
|
||||
# or use environment vars.
|
||||
|
||||
chgrpprog=${CHGRPPROG-chgrp}
|
||||
chmodprog=${CHMODPROG-chmod}
|
||||
chownprog=${CHOWNPROG-chown}
|
||||
cmpprog=${CMPPROG-cmp}
|
||||
cpprog=${CPPROG-cp}
|
||||
mkdirprog=${MKDIRPROG-mkdir}
|
||||
mvprog=${MVPROG-mv}
|
||||
rmprog=${RMPROG-rm}
|
||||
stripprog=${STRIPPROG-strip}
|
||||
|
||||
posix_glob='?'
|
||||
initialize_posix_glob='
|
||||
test "$posix_glob" != "?" || {
|
||||
if (set -f) 2>/dev/null; then
|
||||
posix_glob=
|
||||
else
|
||||
posix_glob=:
|
||||
fi
|
||||
}
|
||||
'
|
||||
|
||||
posix_mkdir=
|
||||
|
||||
# Desired mode of installed file.
|
||||
mode=0755
|
||||
|
||||
chgrpcmd=
|
||||
chmodcmd=$chmodprog
|
||||
chowncmd=
|
||||
mvcmd=$mvprog
|
||||
rmcmd="$rmprog -f"
|
||||
stripcmd=
|
||||
|
||||
src=
|
||||
dst=
|
||||
dir_arg=
|
||||
dst_arg=
|
||||
|
||||
copy_on_change=false
|
||||
no_target_directory=
|
||||
|
||||
usage="\
|
||||
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
|
||||
or: $0 [OPTION]... SRCFILES... DIRECTORY
|
||||
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
|
||||
or: $0 [OPTION]... -d DIRECTORIES...
|
||||
|
||||
In the 1st form, copy SRCFILE to DSTFILE.
|
||||
In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
|
||||
In the 4th, create DIRECTORIES.
|
||||
|
||||
Options:
|
||||
--help display this help and exit.
|
||||
--version display version info and exit.
|
||||
|
||||
-c (ignored)
|
||||
-C install only if different (preserve the last data modification time)
|
||||
-d create directories instead of installing files.
|
||||
-g GROUP $chgrpprog installed files to GROUP.
|
||||
-m MODE $chmodprog installed files to MODE.
|
||||
-o USER $chownprog installed files to USER.
|
||||
-s $stripprog installed files.
|
||||
-t DIRECTORY install into DIRECTORY.
|
||||
-T report an error if DSTFILE is a directory.
|
||||
|
||||
Environment variables override the default commands:
|
||||
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
|
||||
RMPROG STRIPPROG
|
||||
"
|
||||
|
||||
while test $# -ne 0; do
|
||||
case $1 in
|
||||
-c) ;;
|
||||
|
||||
-C) copy_on_change=true;;
|
||||
|
||||
-d) dir_arg=true;;
|
||||
|
||||
-g) chgrpcmd="$chgrpprog $2"
|
||||
shift;;
|
||||
|
||||
--help) echo "$usage"; exit $?;;
|
||||
|
||||
-m) mode=$2
|
||||
case $mode in
|
||||
*' '* | *' '* | *'
|
||||
'* | *'*'* | *'?'* | *'['*)
|
||||
echo "$0: invalid mode: $mode" >&2
|
||||
exit 1;;
|
||||
esac
|
||||
shift;;
|
||||
|
||||
-o) chowncmd="$chownprog $2"
|
||||
shift;;
|
||||
|
||||
-s) stripcmd=$stripprog;;
|
||||
|
||||
-t) dst_arg=$2
|
||||
shift;;
|
||||
|
||||
-T) no_target_directory=true;;
|
||||
|
||||
--version) echo "$0 $scriptversion"; exit $?;;
|
||||
|
||||
--) shift
|
||||
break;;
|
||||
|
||||
-*) echo "$0: invalid option: $1" >&2
|
||||
exit 1;;
|
||||
|
||||
*) break;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
|
||||
# When -d is used, all remaining arguments are directories to create.
|
||||
# When -t is used, the destination is already specified.
|
||||
# Otherwise, the last argument is the destination. Remove it from $@.
|
||||
for arg
|
||||
do
|
||||
if test -n "$dst_arg"; then
|
||||
# $@ is not empty: it contains at least $arg.
|
||||
set fnord "$@" "$dst_arg"
|
||||
shift # fnord
|
||||
fi
|
||||
shift # arg
|
||||
dst_arg=$arg
|
||||
done
|
||||
fi
|
||||
|
||||
if test $# -eq 0; then
|
||||
if test -z "$dir_arg"; then
|
||||
echo "$0: no input file specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
# It's OK to call `install-sh -d' without argument.
|
||||
# This can happen when creating conditional directories.
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test -z "$dir_arg"; then
|
||||
trap '(exit $?); exit' 1 2 13 15
|
||||
|
||||
# Set umask so as not to create temps with too-generous modes.
|
||||
# However, 'strip' requires both read and write access to temps.
|
||||
case $mode in
|
||||
# Optimize common cases.
|
||||
*644) cp_umask=133;;
|
||||
*755) cp_umask=22;;
|
||||
|
||||
*[0-7])
|
||||
if test -z "$stripcmd"; then
|
||||
u_plus_rw=
|
||||
else
|
||||
u_plus_rw='% 200'
|
||||
fi
|
||||
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
|
||||
*)
|
||||
if test -z "$stripcmd"; then
|
||||
u_plus_rw=
|
||||
else
|
||||
u_plus_rw=,u+rw
|
||||
fi
|
||||
cp_umask=$mode$u_plus_rw;;
|
||||
esac
|
||||
fi
|
||||
|
||||
for src
|
||||
do
|
||||
# Protect names starting with `-'.
|
||||
case $src in
|
||||
-*) src=./$src;;
|
||||
esac
|
||||
|
||||
if test -n "$dir_arg"; then
|
||||
dst=$src
|
||||
dstdir=$dst
|
||||
test -d "$dstdir"
|
||||
dstdir_status=$?
|
||||
else
|
||||
|
||||
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
|
||||
# might cause directories to be created, which would be especially bad
|
||||
# if $src (and thus $dsttmp) contains '*'.
|
||||
if test ! -f "$src" && test ! -d "$src"; then
|
||||
echo "$0: $src does not exist." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test -z "$dst_arg"; then
|
||||
echo "$0: no destination specified." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
dst=$dst_arg
|
||||
# Protect names starting with `-'.
|
||||
case $dst in
|
||||
-*) dst=./$dst;;
|
||||
esac
|
||||
|
||||
# If destination is a directory, append the input filename; won't work
|
||||
# if double slashes aren't ignored.
|
||||
if test -d "$dst"; then
|
||||
if test -n "$no_target_directory"; then
|
||||
echo "$0: $dst_arg: Is a directory" >&2
|
||||
exit 1
|
||||
fi
|
||||
dstdir=$dst
|
||||
dst=$dstdir/`basename "$src"`
|
||||
dstdir_status=0
|
||||
else
|
||||
# Prefer dirname, but fall back on a substitute if dirname fails.
|
||||
dstdir=`
|
||||
(dirname "$dst") 2>/dev/null ||
|
||||
expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
|
||||
X"$dst" : 'X\(//\)[^/]' \| \
|
||||
X"$dst" : 'X\(//\)$' \| \
|
||||
X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
|
||||
echo X"$dst" |
|
||||
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\(\/\/\)[^/].*/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\(\/\/\)$/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
/^X\(\/\).*/{
|
||||
s//\1/
|
||||
q
|
||||
}
|
||||
s/.*/./; q'
|
||||
`
|
||||
|
||||
test -d "$dstdir"
|
||||
dstdir_status=$?
|
||||
fi
|
||||
fi
|
||||
|
||||
obsolete_mkdir_used=false
|
||||
|
||||
if test $dstdir_status != 0; then
|
||||
case $posix_mkdir in
|
||||
'')
|
||||
# Create intermediate dirs using mode 755 as modified by the umask.
|
||||
# This is like FreeBSD 'install' as of 1997-10-28.
|
||||
umask=`umask`
|
||||
case $stripcmd.$umask in
|
||||
# Optimize common cases.
|
||||
*[2367][2367]) mkdir_umask=$umask;;
|
||||
.*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
|
||||
|
||||
*[0-7])
|
||||
mkdir_umask=`expr $umask + 22 \
|
||||
- $umask % 100 % 40 + $umask % 20 \
|
||||
- $umask % 10 % 4 + $umask % 2
|
||||
`;;
|
||||
*) mkdir_umask=$umask,go-w;;
|
||||
esac
|
||||
|
||||
# With -d, create the new directory with the user-specified mode.
|
||||
# Otherwise, rely on $mkdir_umask.
|
||||
if test -n "$dir_arg"; then
|
||||
mkdir_mode=-m$mode
|
||||
else
|
||||
mkdir_mode=
|
||||
fi
|
||||
|
||||
posix_mkdir=false
|
||||
case $umask in
|
||||
*[123567][0-7][0-7])
|
||||
# POSIX mkdir -p sets u+wx bits regardless of umask, which
|
||||
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
|
||||
;;
|
||||
*)
|
||||
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
|
||||
trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
|
||||
|
||||
if (umask $mkdir_umask &&
|
||||
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
|
||||
then
|
||||
if test -z "$dir_arg" || {
|
||||
# Check for POSIX incompatibilities with -m.
|
||||
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
|
||||
# other-writeable bit of parent directory when it shouldn't.
|
||||
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
|
||||
ls_ld_tmpdir=`ls -ld "$tmpdir"`
|
||||
case $ls_ld_tmpdir in
|
||||
d????-?r-*) different_mode=700;;
|
||||
d????-?--*) different_mode=755;;
|
||||
*) false;;
|
||||
esac &&
|
||||
$mkdirprog -m$different_mode -p -- "$tmpdir" && {
|
||||
ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
|
||||
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
|
||||
}
|
||||
}
|
||||
then posix_mkdir=:
|
||||
fi
|
||||
rmdir "$tmpdir/d" "$tmpdir"
|
||||
else
|
||||
# Remove any dirs left behind by ancient mkdir implementations.
|
||||
rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
|
||||
fi
|
||||
trap '' 0;;
|
||||
esac;;
|
||||
esac
|
||||
|
||||
if
|
||||
$posix_mkdir && (
|
||||
umask $mkdir_umask &&
|
||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
|
||||
)
|
||||
then :
|
||||
else
|
||||
|
||||
# The umask is ridiculous, or mkdir does not conform to POSIX,
|
||||
# or it failed possibly due to a race condition. Create the
|
||||
# directory the slow way, step by step, checking for races as we go.
|
||||
|
||||
case $dstdir in
|
||||
/*) prefix='/';;
|
||||
-*) prefix='./';;
|
||||
*) prefix='';;
|
||||
esac
|
||||
|
||||
eval "$initialize_posix_glob"
|
||||
|
||||
oIFS=$IFS
|
||||
IFS=/
|
||||
$posix_glob set -f
|
||||
set fnord $dstdir
|
||||
shift
|
||||
$posix_glob set +f
|
||||
IFS=$oIFS
|
||||
|
||||
prefixes=
|
||||
|
||||
for d
|
||||
do
|
||||
test -z "$d" && continue
|
||||
|
||||
prefix=$prefix$d
|
||||
if test -d "$prefix"; then
|
||||
prefixes=
|
||||
else
|
||||
if $posix_mkdir; then
|
||||
(umask=$mkdir_umask &&
|
||||
$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
|
||||
# Don't fail if two instances are running concurrently.
|
||||
test -d "$prefix" || exit 1
|
||||
else
|
||||
case $prefix in
|
||||
*\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
|
||||
*) qprefix=$prefix;;
|
||||
esac
|
||||
prefixes="$prefixes '$qprefix'"
|
||||
fi
|
||||
fi
|
||||
prefix=$prefix/
|
||||
done
|
||||
|
||||
if test -n "$prefixes"; then
|
||||
# Don't fail if two instances are running concurrently.
|
||||
(umask $mkdir_umask &&
|
||||
eval "\$doit_exec \$mkdirprog $prefixes") ||
|
||||
test -d "$dstdir" || exit 1
|
||||
obsolete_mkdir_used=true
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -n "$dir_arg"; then
|
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
|
||||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
|
||||
{ test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
|
||||
test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
|
||||
else
|
||||
|
||||
# Make a couple of temp file names in the proper directory.
|
||||
dsttmp=$dstdir/_inst.$$_
|
||||
rmtmp=$dstdir/_rm.$$_
|
||||
|
||||
# Trap to clean up those temp files at exit.
|
||||
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
|
||||
|
||||
# Copy the file name to the temp name.
|
||||
(umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
|
||||
|
||||
# and set any options; do chmod last to preserve setuid bits.
|
||||
#
|
||||
# If any of these fail, we abort the whole thing. If we want to
|
||||
# ignore errors from any of these, just make sure not to ignore
|
||||
# errors from the above "$doit $cpprog $src $dsttmp" command.
|
||||
#
|
||||
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
|
||||
{ test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
|
||||
{ test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
|
||||
{ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
|
||||
|
||||
# If -C, don't bother to copy if it wouldn't change the file.
|
||||
if $copy_on_change &&
|
||||
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
|
||||
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
|
||||
|
||||
eval "$initialize_posix_glob" &&
|
||||
$posix_glob set -f &&
|
||||
set X $old && old=:$2:$4:$5:$6 &&
|
||||
set X $new && new=:$2:$4:$5:$6 &&
|
||||
$posix_glob set +f &&
|
||||
|
||||
test "$old" = "$new" &&
|
||||
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
|
||||
then
|
||||
rm -f "$dsttmp"
|
||||
else
|
||||
# Rename the file to the real destination.
|
||||
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
|
||||
|
||||
# The rename failed, perhaps because mv can't rename something else
|
||||
# to itself, or perhaps because mv is so ancient that it does not
|
||||
# support -f.
|
||||
{
|
||||
# Now remove or move aside any old file at destination location.
|
||||
# We try this two ways since rm can't unlink itself on some
|
||||
# systems and the destination file might be busy for other
|
||||
# reasons. In this case, the final cleanup might fail but the new
|
||||
# file should still install successfully.
|
||||
{
|
||||
test ! -f "$dst" ||
|
||||
$doit $rmcmd -f "$dst" 2>/dev/null ||
|
||||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
|
||||
{ $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
|
||||
} ||
|
||||
{ echo "$0: cannot unlink or rename $dst" >&2
|
||||
(exit 1); exit 1
|
||||
}
|
||||
} &&
|
||||
|
||||
# Now rename the file to the real destination.
|
||||
$doit $mvcmd "$dsttmp" "$dst"
|
||||
}
|
||||
fi || exit 1
|
||||
|
||||
trap '' 0
|
||||
fi
|
||||
done
|
||||
|
||||
# Local variables:
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
@@ -19,7 +19,9 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define _WIN32_IE 0x0500
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <windowsx.h>
|
||||
@@ -30,7 +32,6 @@
|
||||
#include <stdarg.h>
|
||||
#include <malloc.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "main.h"
|
||||
#include "localization.h"
|
||||
#include "openvpn-gui-res.h"
|
||||
|
||||
10
main.c
10
main.c
@@ -19,13 +19,15 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define _WIN32_IE 0x0500
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <shlwapi.h>
|
||||
#include <prsht.h>
|
||||
#include <pbt.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "tray.h"
|
||||
#include "openvpn.h"
|
||||
#include "openvpn_config.h"
|
||||
@@ -87,9 +89,9 @@ VerifyAutoConnections()
|
||||
}
|
||||
|
||||
|
||||
int WINAPI WinMain (HINSTANCE hThisInstance,
|
||||
int WINAPI _tWinMain (HINSTANCE hThisInstance,
|
||||
UNUSED HINSTANCE hPrevInstance,
|
||||
UNUSED LPSTR lpszArgument,
|
||||
UNUSED LPTSTR lpszArgument,
|
||||
UNUSED int nCmdShow)
|
||||
{
|
||||
MSG messages; /* Here messages to the application are saved */
|
||||
|
||||
5
manage.c
5
manage.c
@@ -19,6 +19,11 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <winsock2.h>
|
||||
#include <malloc.h>
|
||||
|
||||
|
||||
2
manage.h
2
manage.h
@@ -22,6 +22,8 @@
|
||||
#ifndef MANAGE_H
|
||||
#define MANAGE_H
|
||||
|
||||
#include <winsock2.h>
|
||||
|
||||
#define WM_MANAGEMENT (WM_APP + 2)
|
||||
|
||||
typedef enum {
|
||||
|
||||
@@ -20,7 +20,9 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define WINVER 0x0500
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
@@ -29,7 +31,6 @@
|
||||
#include <process.h>
|
||||
#include <richedit.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "tray.h"
|
||||
#include "main.h"
|
||||
#include "openvpn.h"
|
||||
|
||||
@@ -20,9 +20,12 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "main.h"
|
||||
#include "openvpn-gui-res.h"
|
||||
#include "options.h"
|
||||
|
||||
@@ -21,12 +21,15 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
#include <memory.h>
|
||||
#include <windows.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "options.h"
|
||||
#include "main.h"
|
||||
#include "openvpn-gui-res.h"
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#ifndef DISABLE_CHANGE_PASSWORD
|
||||
#include <openssl/pem.h>
|
||||
#include <openssl/err.h>
|
||||
@@ -29,7 +33,6 @@
|
||||
#include <windows.h>
|
||||
#include <wincrypt.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "passphrase.h"
|
||||
|
||||
6
proxy.c
6
proxy.c
@@ -20,7 +20,10 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define WINVER 0x0500
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <prsht.h>
|
||||
@@ -28,7 +31,6 @@
|
||||
#include <wininet.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "registry.h"
|
||||
|
||||
@@ -20,12 +20,14 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
#include <shlobj.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
#include "openvpn-gui-res.h"
|
||||
|
||||
@@ -19,9 +19,12 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include <windows.h>
|
||||
#include "config.h"
|
||||
#include "openvpn-gui-res.h"
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <winresrc.h>
|
||||
#include "../openvpn-gui-res.h"
|
||||
|
||||
/* Language resource files are UTF-8 encoded */
|
||||
#pragma code_page(65001)
|
||||
@@ -52,7 +55,7 @@ ID_ICO_DISCONNECTED ICON DISCARDABLE "disconnected.ico"
|
||||
|
||||
/* Version information and such */
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION PACKAGE_MAJOR_VERSION,PACKAGE_MINOR_VERSION,PACKAGE_RELEASE,0
|
||||
FILEVERSION PACKAGE_VERSION_RESOURCE
|
||||
FILEOS VOS_NT
|
||||
FILETYPE VFT_APP
|
||||
BEGIN
|
||||
|
||||
@@ -20,6 +20,10 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <process.h>
|
||||
#include <tchar.h>
|
||||
@@ -27,7 +31,6 @@
|
||||
#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "main.h"
|
||||
#include "openvpn-gui-res.h"
|
||||
#include "options.h"
|
||||
|
||||
@@ -19,10 +19,13 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "tray.h"
|
||||
#include "service.h"
|
||||
#include "openvpn.h"
|
||||
|
||||
5
tray.c
5
tray.c
@@ -20,14 +20,15 @@
|
||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#define _WIN32_IE 0x0500
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
#include <shellapi.h>
|
||||
#include <tchar.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "config.h"
|
||||
#include "tray.h"
|
||||
#include "service.h"
|
||||
#include "main.h"
|
||||
|
||||
Reference in New Issue
Block a user