Skip to content

Commit

Permalink
Fixed config. files for distribution
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Apr 13, 2015
1 parent 47a55d2 commit 09b37ff
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 60 deletions.
10 changes: 5 additions & 5 deletions config_examples/driver/sim.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</variable>

<variable type="boolean">
<name>SIM1_BLEVEL0</name>
<note>This is a Level I node.</note>
<value>true</value>
<name>SIM1_BLEVEL20</name>
<note>This is not a Level II node.</note>
<value>false</value>
</variable>

<variable type="integer">
Expand All @@ -36,7 +36,7 @@
<variable type="guid">
<name>SIM1_GUID0</name>
<note>GUID for the node.</note>
<value>11:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00</value>
<value>FF:FF:FF:FF:FF:FF:FF:F7:03:00:00:00:00:00:00:00</value>
</variable>

<variable type="string">
Expand All @@ -48,7 +48,7 @@
<variable type="integer">
<name>SIM1_INTERVAL0</name>
<note>Interval between measurement events.</note>
<value>0</value>
<value>2</value>
</variable>

<variable type="long">
Expand Down
10 changes: 5 additions & 5 deletions config_examples/variables.xml_distro
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</variable>

<variable type="boolean">
<name>SIM1_BLEVEL0</name>
<note>This is a Level I node.</note>
<value>true</value>
<name>SIM1_BLEVEL20</name>
<note>This is not a Level II node.</note>
<value>false</value>
</variable>

<variable type="integer">
Expand All @@ -40,7 +40,7 @@
<variable type="guid">
<name>SIM1_GUID0</name>
<note>GUID for the node.</note>
<value>11:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00</value>
<value>FF:FF:FF:FF:FF:FF:FF:F7:03:00:00:00:00:00:00:00</value>
</variable>

<variable type="string">
Expand All @@ -52,7 +52,7 @@
<variable type="integer">
<name>SIM1_INTERVAL0</name>
<note>Interval between measurement events.</note>
<value>0</value>
<value>2</value>
</variable>

<variable type="long">
Expand Down
4 changes: 2 additions & 2 deletions src/vscp/drivers/level2/btdetect/win32/vscpbtdetect.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;wxUSE_GUI=0;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;vscpbtdetect_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;wxUSE_GUI=0;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;vscpbtdetect_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down Expand Up @@ -118,7 +118,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(WXWIN)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;wxUSE_GUI=0;WIN32;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_DEBUG;_WINDOWS;_USRDLL;vscpbtdetect_EXPORTS;wxUSE_GUI=0;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;wxUSE_GUI=0;WIN32;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_DEBUG;_WINDOWS;_USRDLL;vscpbtdetect_EXPORTS;wxUSE_GUI=0;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>.\Debug/vscpbtdetect.pch</PrecompiledHeaderOutputFile>
Expand Down
4 changes: 2 additions & 2 deletions src/vscp/drivers/level2/logger/win32/vscplogger.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;_CRT_SECURE_NO_WARNINGS;wxUSE_GUI=0;WIN32;NDEBUG;_WINDOWS;_USRDLL;vscplogger_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;_CRT_SECURE_NO_WARNINGS;wxUSE_GUI=0;WIN32;NDEBUG;_WINDOWS;_USRDLL;vscplogger_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down Expand Up @@ -118,7 +118,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;_CRT_SECURE_NO_WARNINGS;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;VSCPLOGGER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;_CRT_SECURE_NO_WARNINGS;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;VSCPLOGGER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeaderOutputFile>.\Debug/vscplogger.pch</PrecompiledHeaderOutputFile>
Expand Down
4 changes: 2 additions & 2 deletions src/vscp/drivers/level2/rawethernet/win32/rawethernet.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;_ALLOW_KEYWORD_MACROS;wxUSE_GUI=0;_WINDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;_ALLOW_KEYWORD_MACROS;wxUSE_GUI=0;_WINDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Release\rawethernet.pch</PrecompiledHeaderOutputFile>
Expand Down Expand Up @@ -121,7 +121,7 @@
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;_ALLOW_KEYWORD_MACROS;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;_ALLOW_KEYWORD_MACROS;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Debug\rawethernet.pch</PrecompiledHeaderOutputFile>
Expand Down
2 changes: 1 addition & 1 deletion src/vscp/drivers/level2/sim/common/simulation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ CSim::open(const char *pUsername,

bool bvalue;
strName = m_prefix +
wxString::FromAscii( "_bLevel" ) + strIteration;
wxString::FromAscii( "_bLevel2" ) + strIteration;
if ( VSCP_ERROR_SUCCESS == m_srvLocal.getVariableBool( strName, &bvalue ) ) {
m_pthreadWork[ i ]->m_bLevel2 = bvalue;
}
Expand Down
4 changes: 2 additions & 2 deletions src/vscp/drivers/level2/sim/win32/simdrv.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;wxUSE_GUI=0;_WINDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;simDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;wxUSE_GUI=0;_WINDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;simDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Release\simdrv.pch</PrecompiledHeaderOutputFile>
Expand Down Expand Up @@ -122,7 +122,7 @@
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;simDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;simDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Debug\simdrv.pch</PrecompiledHeaderOutputFile>
Expand Down
4 changes: 2 additions & 2 deletions src/vscp/drivers/level2/tcpdrv/win32/tcpiplinkdrv.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;wxUSE_GUI=0;_WINDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;wxUSE_GUI=0;_WINDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Release\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Release\tcpiplinkdrv.pch</PrecompiledHeaderOutputFile>
Expand Down Expand Up @@ -122,7 +122,7 @@
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;wxUSE_GUI=0;WIN32;_DEBUG;_WINDOWS;_USRDLL;TCPIPLINKDRV_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeaderOutputFile>.\Debug\tcpiplinkdrv.pch</PrecompiledHeaderOutputFile>
Expand Down
4 changes: 2 additions & 2 deletions src/vscp/helperlib/windows/VSCP helper dll.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\;C:\OpenSSL-Win32\include;$(wxwin)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_SSL;WIN32;__WXMSW__;_DEBUG;_WINDOWS;__WXDEBUG__;wxUSE_GUI=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;NS_ENABLE_SSL;WIN32;__WXMSW__;_DEBUG;_WINDOWS;__WXDEBUG__;wxUSE_GUI=0;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
Expand Down Expand Up @@ -185,7 +185,7 @@ if exist "$(VSCP_HOME)\src\vscp\Build\$(ConfigurationName)" copy /Y "$(OutDir)/$
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>.\;C:\OpenSSL-Win32\include;$(WXWIN)\include\msvc;$(WXWIN)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_SSL;_CRT_SECURE_NO_WARNINGS;WIN32;__WXMSW__;_WINDOWS;wxUSE_GUI=0;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;NS_ENABLE_SSL;_CRT_SECURE_NO_WARNINGS;WIN32;__WXMSW__;_WINDOWS;wxUSE_GUI=0;_AFXDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<PrecompiledHeader>
Expand Down
37 changes: 1 addition & 36 deletions src/vscp/vscp_project.sln
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscphelper", "helperlib\win
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpd", "daemon\win32\vscpd.vcxproj", "{D9DF0267-861A-718C-CD19-F6287DECDC10}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpservice", "vscpservice\vscpservice.vcxproj", "{8D322D88-090A-45B5-1F05-E70A99985F12}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpsrv", "daemon\win32\service\vscpsrv.vcxproj", "{8E990011-435F-BAEA-0990-EAA79FFD50BB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpl2_tcpiplinkdrv", "drivers\level2\tcpdrv\win32\tcpiplinkdrv.vcxproj", "{0178C7D7-82EB-E103-34C4-C73CB82DEDD5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpl2_rawethernetdrv", "drivers\level2\rawethernet\win32\rawethernet.vcxproj", "{9BC2870E-F792-68D9-9A23-536A7329577C}"
Expand All @@ -53,12 +49,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpl1_lircdrv", "drivers\l
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpl1_syslogdrv", "drivers\level1\syslogdrv\windows\syslogdrv.vcxproj", "{20ADB0B9-B8C6-5FCA-8D92-D934D44C298E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usb2can", "drivers\level1\usb2can\usb2can\usb2can.vcxproj", "{0B81E79F-41D9-4E90-8823-76F9F94FAE4F}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpl1_usb2can", "drivers\level1\usb2can\usb2can\usb2can.vcxproj", "{0B81E79F-41D9-4E90-8823-76F9F94FAE4F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vscpl2_simdrv", "drivers\level2\sim\win32\simdrv.vcxproj", "{F3F118D4-E5F1-4505-A1B1-53957BE30DD5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bttest", "drivers\level2\btdetect\win32\test\bttest\bttest\bttest.vcxproj", "{F6C07100-95D5-4CEF-9B64-9CB690E346DB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -199,26 +193,6 @@ Global
{D9DF0267-861A-718C-CD19-F6287DECDC10}.Template|Win32.ActiveCfg = Debug|Win32
{D9DF0267-861A-718C-CD19-F6287DECDC10}.Template|Win32.Build.0 = Debug|Win32
{D9DF0267-861A-718C-CD19-F6287DECDC10}.Template|x64.ActiveCfg = Template|Win32
{8D322D88-090A-45B5-1F05-E70A99985F12}.Debug|Win32.ActiveCfg = Debug|Win32
{8D322D88-090A-45B5-1F05-E70A99985F12}.Debug|Win32.Build.0 = Debug|Win32
{8D322D88-090A-45B5-1F05-E70A99985F12}.Debug|x64.ActiveCfg = Debug|x64
{8D322D88-090A-45B5-1F05-E70A99985F12}.Debug|x64.Build.0 = Debug|x64
{8D322D88-090A-45B5-1F05-E70A99985F12}.Release|Win32.ActiveCfg = Release|Win32
{8D322D88-090A-45B5-1F05-E70A99985F12}.Release|Win32.Build.0 = Release|Win32
{8D322D88-090A-45B5-1F05-E70A99985F12}.Release|x64.ActiveCfg = Release|x64
{8D322D88-090A-45B5-1F05-E70A99985F12}.Release|x64.Build.0 = Release|x64
{8D322D88-090A-45B5-1F05-E70A99985F12}.Template|Win32.ActiveCfg = Debug|Win32
{8D322D88-090A-45B5-1F05-E70A99985F12}.Template|Win32.Build.0 = Debug|Win32
{8D322D88-090A-45B5-1F05-E70A99985F12}.Template|x64.ActiveCfg = Template|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Debug|Win32.ActiveCfg = Debug|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Debug|Win32.Build.0 = Debug|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Debug|x64.ActiveCfg = Debug|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Release|Win32.ActiveCfg = Release|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Release|Win32.Build.0 = Release|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Release|x64.ActiveCfg = Release|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Template|Win32.ActiveCfg = Debug|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Template|Win32.Build.0 = Debug|Win32
{8E990011-435F-BAEA-0990-EAA79FFD50BB}.Template|x64.ActiveCfg = Release|Win32
{0178C7D7-82EB-E103-34C4-C73CB82DEDD5}.Debug|Win32.ActiveCfg = Debug|Win32
{0178C7D7-82EB-E103-34C4-C73CB82DEDD5}.Debug|Win32.Build.0 = Debug|Win32
{0178C7D7-82EB-E103-34C4-C73CB82DEDD5}.Debug|x64.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -329,15 +303,6 @@ Global
{F3F118D4-E5F1-4505-A1B1-53957BE30DD5}.Template|Win32.ActiveCfg = Release|Win32
{F3F118D4-E5F1-4505-A1B1-53957BE30DD5}.Template|Win32.Build.0 = Release|Win32
{F3F118D4-E5F1-4505-A1B1-53957BE30DD5}.Template|x64.ActiveCfg = Release|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Debug|Win32.ActiveCfg = Debug|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Debug|Win32.Build.0 = Debug|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Debug|x64.ActiveCfg = Debug|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Release|Win32.ActiveCfg = Release|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Release|Win32.Build.0 = Release|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Release|x64.ActiveCfg = Release|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Template|Win32.ActiveCfg = Release|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Template|Win32.Build.0 = Release|Win32
{F6C07100-95D5-4CEF-9B64-9CB690E346DB}.Template|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion src/vscp/vscpworks/vscpworks.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_GETADDRINFO;NS_ENABLE_SSL;NS_ENABLE_THREADS;_CRT_SECURE_NO_WARNINGS;NOPCH;WIN32;__WXMSW__;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>USE_FOSSA;NS_ENABLE_THREADS;NS_ENABLE_SSL;_CRT_SECURE_NO_WARNINGS;NOPCH;WIN32;__WXMSW__;_WINDOWS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
<AdditionalIncludeDirectories>.\;$(OPENSSL)\include;$(WXWIN)/lib/vc_lib/mswu;$(WXWIN)/include;$(WXWIN)/contrib/include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Expand Down

0 comments on commit 09b37ff

Please sign in to comment.