Browse Source

fixes for MSVC

Julius Pfrommer 10 years ago
parent
commit
0de2f8011e
2 changed files with 5 additions and 5 deletions
  1. 4 4
      CMakeLists.txt
  2. 1 1
      tools/generate_datatypes.py

+ 4 - 4
CMakeLists.txt

@@ -26,7 +26,7 @@ set(lib_sources
                 ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.c
                 ${PROJECT_BINARY_DIR}/src_generated/ua_transport_generated.c
                 src/ua_securechannel.c
-                src/ua_session.c)
+                src/ua_session.c
                 # src/server/ua_server.c
 				# src/server/ua_server_addressspace.c
 				# src/server/ua_server_binary.c
@@ -39,9 +39,9 @@ set(lib_sources
                 # src/server/ua_services_securechannel.c
                 # src/server/ua_services_nodemanagement.c
                 # src/server/ua_services_view.c
-				# ${exported_headers}
-				# ${generated_headers}
-                # ${headers})
+				${exported_headers}
+				${generated_headers}
+                ${headers})
 
 # compiler flags
 if(CMAKE_COMPILER_IS_GNUCC OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")

+ 1 - 1
tools/generate_datatypes.py

@@ -456,7 +456,7 @@ for t in types.itervalues():
     printc(t.typelayout_c(args.namespace_id == 0) + ",")
 printc("};\n")
 if args.typedescriptions:
-    printc('const UA_UInt32 *' + outname.upper() + '_ID = (UA_UInt32[]){')
+    printc('const UA_UInt32 *' + outname.upper() + '_IDS = (UA_UInt32[]){')
     for t in types.itervalues():
         print(str(typedescriptions[t.name].nodeid) + ", ", end='', file=fc)
     printc("};")