Página inicial Explorar Ajuda
Entrar
thomas
/
open62541
Observar 1
Favorito 0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Tree: c4ea9966a7
Branches Tags
open62541
/
ports
/
WAGO-750-860.patch

WAGO-750-860.patch 2.7 KB
Histórico Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263 
  1. commit b801b9275cb93f2cea1dce231f01780bed9834ca
    2. 

  2. Author: FlorianPalm <f.palm@plt.rwth-aachen.de>
    3. 

  3. Date:   Wed Dec 10 10:21:44 2014 +0100
    4. 

  4. 

  5.     changes for WAGO 750-860
    6. 

  6. 

  7. diff --git a/CMakeLists.txt b/CMakeLists.txt
    8. 

  8. index 87489b3..76c4aa0 100644
    9. 

  9. --- a/CMakeLists.txt
    10. 

  10. +++ b/CMakeLists.txt
    11. 

  11. @@ -41,18 +41,16 @@ set(lib_sources src/ua_types.c
    12. 

  12.  
    13. 

  13.  # compiler flags
    14. 

  14.  if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
    15. 

  15. -add_definitions(-std=c99 -pedantic -pipe -Wall -Wextra -Werror -Wformat
    16. 

  16. -                -Wno-unused-parameter -Wno-unused-function -Wno-unused-label -Wpointer-arith -Wreturn-type -Wsign-compare -Wmultichar
    17. 

  17. -                -Winit-self -Wuninitialized -Wno-deprecated -Wformat-security -ffunction-sections -fdata-sections)
    18. 

  18. +add_definitions(-std=c99 -fomit-frame-pointer -pipe -msoft-float -fno-builtin -DEMBED -fno-strict-aliasing)
    19. 

  19.      if(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
    20. 

  20.          add_definitions(-Wformat-nonliteral)
    21. 

  21. -        set (CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,--gc-sections")
    22. 

  22. -        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections")
    23. 

  23. +        set (CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -Wl,-elf2flt -msoft-float")
    24. 

  24. +        set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}  -Wl,-elf2flt -msoft-float")
    25. 

  25.      else()
    26. 

  26.          add_definitions(-Wno-gnu-statement-expression)
    27. 

  27.      endif()
    28. 

  28.  	if(NOT WIN32)
    29. 

  29. -	    add_definitions(-fstack-protector -fPIC -fvisibility=hidden)
    30. 

  30. +	   # add_definitions(-fPIC)
    31. 

  31.  	endif()
    32. 

  32.  endif()
    33. 

  33.  
    34. 

  34. @@ -115,8 +113,8 @@ else()
    35. 

  35.  endif()
    36. 

  36.  
    37. 

  37.  add_library(open62541-objects OBJECT ${lib_sources}) # static version that exports all symbols
    38. 

  38. -add_library(open62541 SHARED $<TARGET_OBJECTS:open62541-objects>)
    39. 

  39. -target_compile_definitions(open62541-objects PUBLIC UA_DYNAMIC_LINKING)
    40. 

  40. +add_library(open62541 $<TARGET_OBJECTS:open62541-objects>)
    41. 

  41. +#target_compile_definitions(open62541-objects PUBLIC UA_DYNAMIC_LINKING)
    42. 

  42.  
    43. 

  43.  ## logging
    44. 

  44.  set(UA_LOGLEVEL 400 CACHE STRING "Level at which logs shall be reported")
    45. 

  45. @@ -137,7 +135,7 @@ endif()
    46. 

  46.  configure_file("src/ua_config.h.in" "${PROJECT_BINARY_DIR}/src_generated/ua_config.h")
    47. 

  47.  
    48. 

  48.  # download queue.h if required
    49. 

  49. -if(WIN32)
    50. 

  50. +#if(WIN32)
    51. 

  51.      if(NOT EXISTS "${PROJECT_BINARY_DIR}/src_generated/queue.h")
    52. 

  52.          file(DOWNLOAD "http://openbsd.cs.toronto.edu/cgi-bin/cvsweb/~checkout~/src/sys/sys/queue.h" "${PROJECT_BINARY_DIR}/src_generated/queue.h" STATUS result)
    53. 

  53.          list(GET result 0 download_ok)
    54. 

  54. @@ -146,7 +144,7 @@ if(WIN32)
    55. 

  55.              message(FATAL_ERROR "queue.h could not be downloaded")
    56. 

  56.          endif()
    57. 

  57.      endif()
    58. 

  58. -endif(WIN32)
    59. 

  59. +#endif(WIN32)
    60. 

  60.  
    61. 

  61.  # generate code from xml definitions
    62. 

  62.  file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/src_generated")
    63. 

  63.