Menu
▾
▴
[Can-svn] SF.net SVN: can: [807] trunk/src/vscp
|
From: <ak...@us...> - 2008-02-03 17:31:47
|
Revision: 807
http://can.svn.sourceforge.net/can/?rev=807&view=rev
Author: akhe
Date: 2008-02-03 09:29:50 -0800 (Sun, 03 Feb 2008)
Log Message:
-----------
Fixed bug that set hard coded bit in header CANAL id even when it should not be set.
Modified Paths:
--------------
trunk/src/vscp/common/devicethread.cpp
trunk/src/vscp/common/vscp.h
trunk/src/vscp/common/vscphelper.cpp
trunk/src/vscp/vscpworks/vscpworks.dsp
Modified: trunk/src/vscp/common/devicethread.cpp
===================================================================
--- trunk/src/vscp/common/devicethread.cpp 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/common/devicethread.cpp 2008-02-03 17:29:50 UTC (rev 807)
@@ -639,7 +639,7 @@
m_pMainThreadObj->m_pDeviceItem->m_pClientItem->m_mutexClientInputQueue.Unlock();
canalMsg canalMsg;
- convertEventToCanal ( &canalMsg, pqueueEvent );
+ convertEventToCanal( &canalMsg, pqueueEvent );
if ( CANAL_ERROR_SUCCESS ==
m_pMainThreadObj->m_pDeviceItem->m_proc_CanalBlockingSend ( m_pMainThreadObj->m_pDeviceItem->m_openHandle, &canalMsg, 300 ) ) {
// Remove the node
Modified: trunk/src/vscp/common/vscp.h
===================================================================
--- trunk/src/vscp/common/vscp.h 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/common/vscp.h 2008-02-03 17:29:50 UTC (rev 807)
@@ -158,7 +158,7 @@
#define VSCO_HEADER_PRIORITY_MASK 0xE0
-#define VSCP_HEADER_HARD_CODED 0x10 // If set node nickname is hardcoded
+#define VSCP_HEADER_HARD_CODED 0x10 // If set if node nickname is hardcoded
#define VSCP_HEADER_NO_CRC 0x08 // Don't calculate CRC
#define VSCP_HEADER_CAN_MSG 0x04 // This is a CAN message
#define VSCP_HEADER_CAN_EXTENDED 0x02 // This is an extended id CAN message
Modified: trunk/src/vscp/common/vscphelper.cpp
===================================================================
--- trunk/src/vscp/common/vscphelper.cpp 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/common/vscphelper.cpp 2008-02-03 17:29:50 UTC (rev 807)
@@ -119,7 +119,7 @@
uint8_t getVSCPheadFromCANid( const uint32_t id )
{
- return ( uint8_t ) ( 0xf0 & ( id >> 21 ) );
+ return ( uint8_t ) ( 0xf0 & ( id >> 21 ) ); // Shift 26-5 1110 0000
};
///////////////////////////////////////////////////////////////////////////////
@@ -158,7 +158,7 @@
//unsigned long t1 = (unsigned long)priority << 20;
//unsigned long t2 = (unsigned long)pvscpMsg->vscp_class << 16;
//unsigned long t3 = (unsigned long)pvscpMsg->vscp_type << 8;
- return ( ( ( unsigned long ) priority << 21 ) |
+ return ( ( ( unsigned long ) priority << 26 ) |
( ( unsigned long ) vscp_class << 16 ) |
( ( unsigned long ) vscp_type << 8 ) |
0 );
@@ -170,7 +170,7 @@
uint32_t getCANidFromVSCPevent( const vscpEvent *pEvent )
{
- return ( ( ( unsigned long ) getVscpPriority( pEvent ) << 21 ) |
+ return ( ( ( unsigned long ) getVscpPriority( pEvent ) << 26 ) |
( ( unsigned long ) pEvent->vscp_class << 16 ) |
( ( unsigned long ) pEvent->vscp_type << 8 ) |
0 );
@@ -673,19 +673,19 @@
pcanalMsg->sizeData = 8;
}
- unsigned char priority = ( pvscpEvent->head & VSCP_MASK_PRIORITY );
+ unsigned char priority = ( ( pvscpEvent->head & VSCP_MASK_PRIORITY ) >> 5);
//unsigned long t1 = (unsigned long)priority << 20;
//unsigned long t2 = (unsigned long)pvscpMsg->vscp_class << 16;
//unsigned long t3 = (unsigned long)pvscpMsg->vscp_type << 8;
- pcanalMsg->id = ( ( unsigned long ) priority << 21 ) |
+ pcanalMsg->id = ( ( unsigned long ) priority << 26 ) |
( ( unsigned long ) vscp_class << 16 ) |
( ( unsigned long ) pvscpEvent->vscp_type << 8 ) |
nodeid; // Normally we are the host of hosts
// but for class=512 events nodeid
// is present in GUID LSB
- if ( pvscpEvent->head | VSCP_HEADER_HARD_CODED ) {
+ if ( pvscpEvent->head & VSCP_HEADER_HARD_CODED ) {
pcanalMsg->id |= VSCP_CAN_ID_HARD_CODED;
}
Modified: trunk/src/vscp/vscpworks/vscpworks.dsp
===================================================================
--- trunk/src/vscp/vscpworks/vscpworks.dsp 2008-02-03 16:38:59 UTC (rev 806)
+++ trunk/src/vscp/vscpworks/vscpworks.dsp 2008-02-03 17:29:50 UTC (rev 807)
@@ -31,7 +31,7 @@
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "vscpworks - Win32 Debug"
+!IF "$(CFG)" == "vscpworks - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -43,20 +43,20 @@
# PROP Output_Dir "VCProjectDebug"
# PROP Intermediate_Dir "VCProjectDebug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /Fd"VCProjectDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /Fd"VCProjectDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /D "_UNICODE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG" /d "_UNICODE"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG" /d "_UNICODE"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswud" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectDebug\vscpworks.exe"
+# ADD LINK32 wxmsw28ud_richtext.lib wxmsw28ud_aui.lib wxmsw28ud_core.lib wxbase28ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxmsw28ud_adv.lib wxmsw28ud_html.lib wxmsw28ud_xrc.lib wxbase28ud_net.lib wxbase28ud_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectDebug\vscpworks.exe"
-!ELSEIF "$(CFG)" == "vscpworks - Win32 Release"
+!ELSEIF "$(CFG)" == "vscpworks - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -68,20 +68,20 @@
# PROP Output_Dir "VCProjectRelease"
# PROP Intermediate_Dir "VCProjectRelease"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /Fd"VCProjectRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /Fd"VCProjectRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/msw" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectRelease\vscpworks.exe"
+# ADD LINK32 wxmsw28_richtext.lib wxmsw28_aui.lib wxmsw28_core.lib wxbase28.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxmsw28_adv.lib wxmsw28_html.lib wxmsw28_xrc.lib wxbase28_net.lib wxbase28_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectRelease\vscpworks.exe"
-!ELSEIF "$(CFG)" == "vscpworks - Win32 Unicode Release"
+!ELSEIF "$(CFG)" == "vscpworks - Win32 Unicode Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -93,20 +93,20 @@
# PROP Output_Dir "VCProjectUnicodeRelease"
# PROP Intermediate_Dir "VCProjectUnicodeRelease"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MD /W4 /GR /O2 /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "_UNICODE" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "_UNICODE"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "_UNICODE"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectUnicodeRelease\vscpworks.pdb" /MD /O2 /GR /EHsc /W4 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D_UNICODE /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswu" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectUnicodeRelease\vscpworks.exe"
+# ADD LINK32 wxmsw28u_richtext.lib wxmsw28u_aui.lib wxmsw28u_core.lib wxbase28u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxmsw28u_adv.lib wxmsw28u_html.lib wxmsw28u_xrc.lib wxbase28u_net.lib wxbase28u_xml.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /out:"VCProjectUnicodeRelease\vscpworks.exe"
-!ELSEIF "$(CFG)" == "vscpworks - Win32 unicode Debug"
+!ELSEIF "$(CFG)" == "vscpworks - Win32 unicode Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -118,20 +118,20 @@
# PROP Output_Dir "VCProjectunicodeDebug"
# PROP Intermediate_Dir "VCProjectunicodeDebug"
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /Fd"VCProjectunicodeDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W4 /GR /Zi /Od /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /FR /Fd"VCProjectunicodeDebug\vscpworks.pdb" /FD /EHsc /c
-# ADD BASE MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NOPCH" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "__WXDEBUG__" /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG"
-# ADD RSC /l 0x405 /i "D:\wxWidgets-2.8.7/include" /i "D:\wxWidgets-2.8.7/contrib/include" /i "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /i "C:\Program Files\Microsoft Visual Studio\vc98\include" /d "NOPCH" /d "WIN32" /d "__WXMSW__" /d "_WINDOWS" /d "__WXDEBUG__" /d "_DEBUG"
+# ADD BASE CPP /nologo /FD /Fd"VCProjectunicodeDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD CPP /nologo /FD /Fd"VCProjectunicodeDebug\vscpworks.pdb" /MDd /Od /GR /EHsc /W4 /Zi /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include" /c
+# ADD BASE MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /mktyplib203 /win32
+# ADD MTL /nologo /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /mktyplib203 /win32
+# ADD BASE RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
+# ADD RSC /l 0x405 /DNOPCH /DWIN32 /D__WXMSW__ /D_WINDOWS /D__WXDEBUG__ /D_DEBUG /I "D:\wxWidgets-2.8.7/include" /I "D:\wxWidgets-2.8.7/contrib/include" /I "D:\wxWidgets-2.8.7/lib/vc_lib/mswd" /I "C:\Program Files\Microsoft Visual Studio\vc98\include"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
-# ADD LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib"
+# ADD BASE LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectunicodeDebug\vscpworks.exe"
+# ADD LINK32 wxmsw28d_richtext.lib wxmsw28d_aui.lib wxmsw28d_core.lib wxbase28d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxmsw28d_adv.lib wxmsw28d_html.lib wxmsw28d_xrc.lib wxbase28d_net.lib wxbase28d_xml.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib /libpath:"D:\wxWidgets-2.8.7/lib/vc_lib" /libpath:"C:\Program Files\Microsoft Visual Studio\vc98\lib" /nologo /SUBSYSTEM:WINDOWS /machine:i386 /DEBUG /out:"VCProjectunicodeDebug\vscpworks.exe"
-!ENDIF
+!ENDIF
# Begin Target
@@ -144,43 +144,47 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE="..\common\canalsuperwrapper.cpp"
+SOURCE="dlgvscpmsg.cpp"
# End Source File
# Begin Source File
-SOURCE="..\..\common\crc.c"
+SOURCE="dlgselectdaemoninterface.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgconfiguration.cpp"
+SOURCE="frmmain.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgnewvscpsession.cpp"
+SOURCE="vscpworks.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgselectdaemoninterface.cpp"
+SOURCE="frmvscpsession.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgvscpfilter.cpp"
+SOURCE="dlgnewvscpsession.cpp"
# End Source File
# Begin Source File
+SOURCE="dlgconfiguration.cpp"
+# End Source File
+# Begin Source File
+
SOURCE="dlgvscpinterfacesettings.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgvscpmsg.cpp"
+SOURCE="dlgvscpfilter.cpp"
# End Source File
# Begin Source File
-SOURCE="dlgvscptrmit.cpp"
+SOURCE="vscpbootloader.cpp"
# End Source File
# Begin Source File
-SOURCE="..\common\dllwrapper.cpp"
+SOURCE="dlgvscptrmit.cpp"
# End Source File
# Begin Source File
@@ -188,47 +192,47 @@
# End Source File
# Begin Source File
-SOURCE="frmmain.cpp"
+SOURCE="readregiister.cpp"
# End Source File
# Begin Source File
-SOURCE="frmvscpsession.cpp"
+SOURCE="writeregister.cpp"
# End Source File
# Begin Source File
-SOURCE="gridtable.cpp"
+SOURCE="readmsfurl.cpp"
# End Source File
# Begin Source File
-SOURCE="..\common\guid.cpp"
+SOURCE="readmdffile.cpp"
# End Source File
# Begin Source File
-SOURCE="..\common\mdf.cpp"
+SOURCE="readguid.cpp"
# End Source File
# Begin Source File
-SOURCE="readguid.cpp"
+SOURCE="..\common\canalsuperwrapper.cpp"
# End Source File
# Begin Source File
-SOURCE="readmdffile.cpp"
+SOURCE="..\..\common\crc.c"
# End Source File
# Begin Source File
-SOURCE="readmsfurl.cpp"
+SOURCE="..\common\dllwrapper.cpp"
# End Source File
# Begin Source File
-SOURCE="readregiister.cpp"
+SOURCE="..\common\guid.cpp"
# End Source File
# Begin Source File
-SOURCE="threadvscpwork.cpp"
+SOURCE="..\common\mdf.cpp"
# End Source File
# Begin Source File
-SOURCE="vscpbootloader.cpp"
+SOURCE="threadvscpwork.cpp"
# End Source File
# Begin Source File
@@ -244,43 +248,40 @@
# End Source File
# Begin Source File
-SOURCE="vscpworks.cpp"
+SOURCE="gridtable.cpp"
# End Source File
# Begin Source File
SOURCE="vscpworks.rc"
# End Source File
-# Begin Source File
-SOURCE="writeregister.cpp"
-# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter ""
# Begin Source File
-SOURCE="..\common\canal.h"
+SOURCE="dlgvscpmsg.h"
# End Source File
# Begin Source File
-SOURCE="..\common\canaldlldef.h"
+SOURCE="dlgselectdaemoninterface.h"
# End Source File
# Begin Source File
-SOURCE="..\common\canalsuperwrapper.h"
+SOURCE="frmmain.h"
# End Source File
# Begin Source File
-SOURCE="..\..\common\crc.h"
+SOURCE="vscpworks.h"
# End Source File
# Begin Source File
-SOURCE="..\common\devicelist.h"
+SOURCE="frmvscpsession.h"
# End Source File
# Begin Source File
-SOURCE="..\common\devitem.h"
+SOURCE="dlgnewvscpsession.h"
# End Source File
# Begin Source File
@@ -288,90 +289,94 @@
# End Source File
# Begin Source File
-SOURCE="dlgnewvscpsession.h"
+SOURCE="dlgvscpinterfacesettings.h"
# End Source File
# Begin Source File
-SOURCE="dlgselectdaemoninterface.h"
+SOURCE="dlgvscpfilter.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscpfilter.h"
+SOURCE="vscpbootloader.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscpinterfacesettings.h"
+SOURCE="dlgvscptrmit.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscpmsg.h"
+SOURCE="frmdeviceconfig.h"
# End Source File
# Begin Source File
-SOURCE="dlgvscptrmit.h"
+SOURCE="readregiister.h"
# End Source File
# Begin Source File
-SOURCE="..\common\dllwrapper.h"
+SOURCE="writeregister.h"
# End Source File
# Begin Source File
-SOURCE="frmdeviceconfig.h"
+SOURCE="readmsfurl.h"
# End Source File
# Begin Source File
-SOURCE="frmmain.h"
+SOURCE="readmdffile.h"
# End Source File
# Begin Source File
-SOURCE="frmvscpsession.h"
+SOURCE="readguid.h"
# End Source File
# Begin Source File
-SOURCE="gridtable.h"
+SOURCE="..\common\canal.h"
# End Source File
# Begin Source File
-SOURCE="..\common\guid.h"
+SOURCE="..\common\canaldlldef.h"
# End Source File
# Begin Source File
-SOURCE="..\common\mdf.h"
+SOURCE="..\common\canalsuperwrapper.h"
# End Source File
# Begin Source File
-SOURCE="platform.h"
+SOURCE="..\..\common\crc.h"
# End Source File
# Begin Source File
-SOURCE="readguid.h"
+SOURCE="..\common\devicelist.h"
# End Source File
# Begin Source File
-SOURCE="readmdffile.h"
+SOURCE="..\common\devitem.h"
# End Source File
# Begin Source File
-SOURCE="readmsfurl.h"
+SOURCE="..\common\dllwrapper.h"
# End Source File
# Begin Source File
-SOURCE="readregiister.h"
+SOURCE="..\common\guid.h"
# End Source File
# Begin Source File
-SOURCE="threadvscpwork.h"
+SOURCE="..\common\mdf.h"
# End Source File
# Begin Source File
-SOURCE="..\common\vscp.h"
+SOURCE="platform.h"
# End Source File
# Begin Source File
-SOURCE="vscpbootloader.h"
+SOURCE="threadvscpwork.h"
# End Source File
# Begin Source File
+SOURCE="..\common\vscp.h"
+# End Source File
+# Begin Source File
+
SOURCE="..\common\vscphelper.h"
# End Source File
# Begin Source File
@@ -388,12 +393,10 @@
# End Source File
# Begin Source File
-SOURCE="vscpworks.h"
+SOURCE="gridtable.h"
# End Source File
-# Begin Source File
-SOURCE="writeregister.h"
-# End Source File
# End Group
# End Target
# End Project
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
