From 13665deb24b3d4df5501dbcfd44c3e4e6bc08d1d Mon Sep 17 00:00:00 2001 From: Ake Hedman Date: Fri, 1 Apr 2016 17:42:24 +0200 Subject: [PATCH] Configuration folder on windows is now /programdata/vscpd --- BUILD_WIN32.txt | 4 ++-- src/vscp/daemon/win32/vscpd.cpp | 4 ++++ src/vscp/daemon/win32/vscpd.vcxproj | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/BUILD_WIN32.txt b/BUILD_WIN32.txt index aa9a27282..72a681fee 100644 --- a/BUILD_WIN32.txt +++ b/BUILD_WIN32.txt @@ -92,8 +92,8 @@ This is the "original" project and includes all sub-projects. Expat is also needed for the level I lirc driver which interfaces http://winlirc.sourceforge.net/ 11.) To build the vectorxl driver (vectorxldrv) an environment variable (VECTORDRV) vectorxl must be defined so it - points to the dll folder of the installation (C:\Users\akhe\development\Vector_CANLIB\dll). The low level driver from vectorxl must be installed - for the CANAL driver to work. Current the old driver is used which can be found here + points to the dll folder of the installation (C:\Users\akhe\development\Vector_CANLIB\dll). The low level driver + from vectorxl must be installed for the CANAL driver to work. Current the old driver is used which can be found here http://download.vectorxl.com/drivers/xl_lib90.zip 12.) To build the rawethernet driver the wpcap library and include files need to be installed on the system. A diff --git a/src/vscp/daemon/win32/vscpd.cpp b/src/vscp/daemon/win32/vscpd.cpp index f29fb9a30..21a1c60ac 100644 --- a/src/vscp/daemon/win32/vscpd.cpp +++ b/src/vscp/daemon/win32/vscpd.cpp @@ -123,7 +123,11 @@ int main(int argc, char **argv) strCfgFile = wxStandardPaths::Get().GetConfigDir(); +#ifdef WIN32 + strCfgFile += _( "\\vscpd.conf" ); +#else strCfgFile += _("/vscp/vscpd.conf"); +#endif wxCmdLineParser *pparser = new wxCmdLineParser( cmdLineDesc, argc, argv ); diff --git a/src/vscp/daemon/win32/vscpd.vcxproj b/src/vscp/daemon/win32/vscpd.vcxproj index 565b53f00..f5c751d73 100644 --- a/src/vscp/daemon/win32/vscpd.vcxproj +++ b/src/vscp/daemon/win32/vscpd.vcxproj @@ -213,7 +213,7 @@ false $(OutDir)$(TargetName)$(TargetExt) $(WXWIN)\lib\vc_lib;$(EXPAT32)\bin\$(Configuration);$(OPENSSL32)\lib\VC;$(LUA32);%(AdditionalLibraryDirectories) - ssleay32MT.lib;libeay32MT.lib;libexpat.lib;lua53.lib;kernel32.lib;netapi32.lib;rpcrt4.lib;%(AdditionalDependencies) + ssleay32MT.lib;libeay32MT.lib;libexpat.lib;lua52.lib;kernel32.lib;netapi32.lib;rpcrt4.lib;%(AdditionalDependencies) MachineX86 @@ -257,7 +257,7 @@ false $(OutDir)$(TargetName)$(TargetExt) $(WXWIN)\lib\vc_x64_lib;$(EXPAT64)\bin\$(Configuration);$(OPENSSL64)\lib\VC;$(LUA64);%(AdditionalLibraryDirectories) - ssleay32MT.lib;libeay32MT.lib;libexpat.lib;comctl32.lib;netapi32.lib;rpcrt4.lib;odbc32.lib;odbccp32.lib;MSVCRTD.lib;lua53.lib;%(AdditionalDependencies) + ssleay32MT.lib;libeay32MT.lib;libexpat.lib;comctl32.lib;netapi32.lib;rpcrt4.lib;odbc32.lib;odbccp32.lib;MSVCRTD.lib;lua52.lib;%(AdditionalDependencies) @@ -345,7 +345,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) $(wxwin)\lib\vc_lib;$(EXPAT32)\bin\$(Configuration);$(OPENSSL32)\lib\VC;$(LUA32);%(AdditionalLibraryDirectories) - ssleay32MT.lib;libeay32MT.lib;libexpat.lib;lua53.lib;kernel32.lib;netapi32.lib;rpcrt4.lib;%(AdditionalDependencies) + ssleay32MT.lib;libeay32MT.lib;libexpat.lib;lua52.lib;kernel32.lib;netapi32.lib;rpcrt4.lib;%(AdditionalDependencies) @@ -389,7 +389,7 @@ Console $(OutDir)$(TargetName)$(TargetExt) $(wxwin)\lib\vc_x64_lib;$(EXPAT64)\bin\$(Configuration);$(OPENSSL64)\lib\VC;$(LUA64);%(AdditionalLibraryDirectories) - ssleay32MT.lib;libeay32MT.lib;libexpat.lib;comctl32.lib;wsock32.lib;netapi32.lib;rpcrt4.lib;msvcrt.lib;lua53.lib;%(AdditionalDependencies) + ssleay32MT.lib;libeay32MT.lib;libexpat.lib;comctl32.lib;wsock32.lib;netapi32.lib;rpcrt4.lib;msvcrt.lib;lua52.lib;%(AdditionalDependencies)