Consolodated the datalink environment variable for building demos on Linux and Windows into a single module (dlenv). Adjusted most demo makefiles.

This commit is contained in:
skarg
2009-05-22 01:45:38 +00:00
parent 1b78d33ddc
commit 7916c7a6de
41 changed files with 316 additions and 943 deletions
@@ -329,6 +329,10 @@ SOURCE=..\..\..\demo\handler\txbuf.c
# End Source File
# Begin Source File
SOURCE=..\..\..\demo\handler\dlenv.c
# End Source File
# Begin Source File
SOURCE=..\..\..\src\version.c
# End Source File
# Begin Source File
+24 -21
View File
@@ -44,36 +44,18 @@
<Add directory="..\..\demo\handler" />
<Add directory="..\..\demo\object" />
</Compiler>
<Unit filename="..\..\src\bacaddr.c">
<Option compilerVar="CC" />
</Unit>
<Linker>
<Add library="winmm" />
</Linker>
<Unit filename="..\..\include\bacaddr.h" />
<Unit filename="..\..\include\bacdef.h" />
<Unit filename="..\..\src\bacint.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\include\bacint.h" />
<Unit filename="..\..\src\crc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\include\crc.h" />
<Unit filename="..\..\include\datalink.h" />
<Unit filename="..\..\include\dlmstp.h" />
<Unit filename="..\..\src\indtext.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\include\indtext.h" />
<Unit filename="..\..\src\mstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\include\mstp.h" />
<Unit filename="..\..\src\mstptext.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\include\mstptext.h" />
<Unit filename="..\..\src\npdu.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\include\npdu.h" />
<Unit filename="dlmstp.c">
<Option compilerVar="CC" />
@@ -82,6 +64,27 @@
<Option compilerVar="CC" />
</Unit>
<Unit filename="rs485.h" />
<Unit filename="..\..\src\bacaddr.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\src\bacint.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\src\crc.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\src\indtext.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\src\mstp.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\src\mstptext.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\..\src\npdu.c">
<Option compilerVar="CC" />
</Unit>
<Extensions>
<code_completion />
<envvars />
-2
View File
@@ -116,8 +116,6 @@ static void RS485_Print_Error(
void)
{
LPVOID lpMsgBuf;
DWORD dwExtSize;
DWORD dwErr;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), /* Default language */
(LPTSTR) & lpMsgBuf, 0, NULL);