Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix simulated systems includes typos #1136

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix simulated systems includes typos #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2284a21
Update BMJ1939Defines.h
jogo- Jan 14, 2018
5ffe768
Update Common.h
jogo- Jan 14, 2018
fd479fe
Clean CAN_NSI.vcxproj
jogo- Jan 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/BUSMASTER/Application/SimulatedSystems/include/BMJ1939Defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ GCC_EXTERN UINT GCC_EXPORT SendAckMsg(UINT, BYTE, BYTE, UINT);
GCC_EXTERN UINT GCC_EXPORT ClaimAddress(BYTE, UINT);
GCC_EXTERN UINT GCC_EXPORT RequestAddress(UINT);
GCC_EXTERN UINT GCC_EXPORT CommandAddress(UINT64, BYTE, UINT);
GCC_EXTERN UINT GCC_EXPORT SetTimout(BYTE, UINT);
GCC_EXTERN UINT GCC_EXPORT SetTimeout(BYTE, UINT);



Expand Down
6 changes: 3 additions & 3 deletions Sources/BUSMASTER/Application/SimulatedSystems/include/Common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _BUSMASTER_COMMAN_H_
#define _BUSMASTER_COMMAN_H_
#ifndef _BUSMASTER_COMMON_H_
#define _BUSMASTER_COMMON_H_


#ifdef __cplusplus
Expand Down Expand Up @@ -40,4 +40,4 @@ const int ERR_INVALID_ADDRESS = -100;
#define BMKEY_F12 0x98


#endif
#endif
15 changes: 1 addition & 14 deletions Sources/BUSMASTER/CAN_NSI/CAN_NSI.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(SolutionDir)\EXTERNAL\libxml2\lib;$(SolutionDir)\EXTERNAL\zlib\lib;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>cmd GetKvaserLib.bat</Command>
</PreBuildEvent>
<Midl>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MkTypLibCompatible>false</MkTypLibCompatible>
Expand All @@ -110,11 +107,6 @@
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreLinkEvent>
<Command>copy "%25TMP%25\canlib32.lib" ".\..\bin\libs\$(IntDir)canlib32.lib"
del "%25TMP%25\canlib32.lib"
</Command>
</PreLinkEvent>
<Link>
<AdditionalOptions>"$(SolutionDir)/BIN/Libs/$(OutDir)DataTypes.lib"
"$(SolutionDir)/BIN/Libs/$(OutDir)Utils.lib" %(AdditionalOptions)</AdditionalOptions>
Expand Down Expand Up @@ -159,11 +151,6 @@ del "%25TMP%25\canlib32.lib"
<Culture>0x0409</Culture>
<AdditionalIncludeDirectories>$(IntDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreLinkEvent>
<Command>copy "%25TMP%25\canlib32.lib" ".\..\bin\libs\$(IntDir)canlib32.lib"
del "%25TMP%25\canlib32.lib"
</Command>
</PreLinkEvent>
<Link>
<AdditionalOptions>"$(SolutionDir)/BIN/Libs/$(OutDir)DataTypes.lib"
"$(SolutionDir)/BIN/Libs/$(OutDir)Utils.lib" %(AdditionalOptions)</AdditionalOptions>
Expand Down Expand Up @@ -270,4 +257,4 @@ del "%25TMP%25\canlib32.lib"
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>