From a16099de245c179203810fb882e1acc8d11d607e Mon Sep 17 00:00:00 2001 From: Frank Voorburg Date: Tue, 24 Oct 2017 16:20:55 +0000 Subject: [PATCH] Refs #424. Added -std=gnu99 flag to CMakeLists.txt files when building with GCC under Windows. git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@380 5dc33758-31d5-4daf-9ae8-b24bf3d40d73 --- Host/BootCommander.exe | Bin 54784 -> 54784 bytes Host/Source/BootCommander/CMakeLists.txt | 6 +++++- Host/Source/LibOpenBLT/CMakeLists.txt | 16 ++++++++++++++-- .../port/windows/canif/lawicel/canusb.c | 2 +- Host/Source/SeedNKey/CMakeLists.txt | 8 ++++++-- Host/libopenblt.dll | Bin 149504 -> 149504 bytes Host/libseednkey.dll | Bin 31232 -> 31232 bytes 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Host/BootCommander.exe b/Host/BootCommander.exe index 9b0e9b2df732452d113993673b1535de8a48f643..28337a6c52722435ae913b4a31aeda8d6522234d 100644 GIT binary patch delta 76 zcmZoz!`!fjc>yEyn)LUZnHd#J<$;Vy1|VPpVhC~2mkyEyt`$!z@r?HdyS diff --git a/Host/Source/BootCommander/CMakeLists.txt b/Host/Source/BootCommander/CMakeLists.txt index e4795205..678e7183 100644 --- a/Host/Source/BootCommander/CMakeLists.txt +++ b/Host/Source/BootCommander/CMakeLists.txt @@ -75,7 +75,11 @@ set(LIBOPENBLT_LIB ${PROJECT_OUTPUT_DIRECTORY}) #**************************************************************************************** # Set platform specific compiler macro PLATFORM_XXX if(WIN32) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS") + if(CMAKE_C_COMPILER_ID MATCHES GNU) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS -std=gnu99") + elseif(CMAKE_C_COMPILER_ID MATCHES MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS") + endif() elseif(UNIX) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99") endif(WIN32) diff --git a/Host/Source/LibOpenBLT/CMakeLists.txt b/Host/Source/LibOpenBLT/CMakeLists.txt index 5e8e51d5..694ea62c 100644 --- a/Host/Source/LibOpenBLT/CMakeLists.txt +++ b/Host/Source/LibOpenBLT/CMakeLists.txt @@ -63,10 +63,8 @@ option(LINT_ENABLED "Configurable to enable/disable the PC-lint target" OFF) # Set the port directory, which is platform specific if(WIN32) set(PROJECT_PORT_DIR ${PROJECT_SOURCE_DIR}/port/windows) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS") elseif(UNIX) set(PROJECT_PORT_DIR ${PROJECT_SOURCE_DIR}/port/linux) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99") endif(WIN32) # Set the output directory @@ -84,6 +82,20 @@ foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} ) set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${PROJECT_OUTPUT_DIRECTORY} ) endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) +#**************************************************************************************** +# Compiler flags +#**************************************************************************************** +# Set platform specific compiler macro PLATFORM_XXX +if(WIN32) + if(CMAKE_C_COMPILER_ID MATCHES GNU) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS -std=gnu99") + elseif(CMAKE_C_COMPILER_ID MATCHES MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS") + endif() +elseif(UNIX) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99") +endif(WIN32) + #*************************************************************************************** # Includes diff --git a/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c b/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c index bc0c5a19..4004230e 100644 --- a/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c +++ b/Host/Source/LibOpenBLT/port/windows/canif/lawicel/canusb.c @@ -245,7 +245,7 @@ static bool CanUsbConnect(void) result = true; /* Set the reception callback function. */ if (CanUsbLibFuncSetReceiveCallBack(canUsbCanHandle, - CanUsbLibReceiveCallback) <= 0) + (LPFNDLL_RECEIVE_CALLBACK)CanUsbLibReceiveCallback) <= 0) { result = false; } diff --git a/Host/Source/SeedNKey/CMakeLists.txt b/Host/Source/SeedNKey/CMakeLists.txt index a37f9db2..fdfb7d64 100644 --- a/Host/Source/SeedNKey/CMakeLists.txt +++ b/Host/Source/SeedNKey/CMakeLists.txt @@ -71,9 +71,13 @@ endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES ) #**************************************************************************************** # Set platform specific compiler macro PLATFORM_XXX if(WIN32) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS") + if(CMAKE_C_COMPILER_ID MATCHES GNU) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS -std=gnu99") + elseif(CMAKE_C_COMPILER_ID MATCHES MSVC) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_WIN32 -D_CRT_SECURE_NO_WARNINGS") + endif() elseif(UNIX) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -std=gnu99") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPLATFORM_LINUX -pthread -std=gnu99") endif(WIN32) diff --git a/Host/libopenblt.dll b/Host/libopenblt.dll index 5505c3a48fc5405a706e1c265947bd33e83a2545..cc67a357d94453db28d2086df27e2198446f19f2 100644 GIT binary patch delta 90 zcmZpez}YZ?bHWei+VuC0zqkHo)YO#+G9wv)fC-3QfmkJukwL|c5hTO_l-usC$M{rS lAmrbiZWR_r$2A|Pg>Q2SxwYNGjqwi`$eiuwfs7}=0RTk+A3^{C delta 90 zcmZpez}YZ?bHWeiwJV-9{@(hVQBzkQ$c$tF0wy4K1!9#rMg|o(MvxE#P;R@k9^+GS mfg5!OB2RX=IJGW%Da*O>OV@S_H^x6)%xi!O%mW!ueggohdLgI) diff --git a/Host/libseednkey.dll b/Host/libseednkey.dll index 1f8c1399270e4aba30a53809832f8d1498217d0e..df2a4bd8637dec351a6c72134e542b8033101ae7 100644 GIT binary patch delta 81 zcmZqp!r1VIal!{C=k$%Aj9lfM)89uj009#ay8&@ZG7txYL>L&H(>FW0sqqR_cd6?g dYiw}Y@|X9uqc&s4=8E7LE}#LMuf=M~008p*7|s9y delta 81 zcmZqp!r1VIal!|t*UlS18M(^6c77kp00c}x>;}Xs$v_+o5@BF??Y!B^O^sK;RJpNF d@fm~re1TPyEjf9wZmtN9;Q|`4`C6=&3;;A#8NdJl