Simple builds. C compatibility. Remove hidapi module and header.

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "unittest/Catch"]
 	path = unittest/Catch
 	url = https://github.com/philsquared/Catch.git
-[submodule "hidapi"]
-	path = hidapi
-	url = https://github.com/Nitrokey/hidapi.git

.travis.yml

@@ -1,58 +1,49 @@
 language: generic
 sudo: false
-os: osx
-env: CF=
 
 matrix:
   include:
-#    - osx_image: xcode7.3 #default
-#      before_install: &brew
-#      - brew update
-#      - brew install hidapi
-    - osx_image: xcode6.4
-    - osx_image: xcode8.2
+    - os: osx
+      osx_image: xcode7.3
+      before_install: &brew
+        - brew update
+        - brew install hidapi
+    - os: osx
+      osx_image: xcode6.4
+      before_install: *brew
+    - os: osx
+      osx_image: xcode8.2
+      before_install: *brew
     - os: linux
       dist: trusty
-      env: COMPILER_NAME=gcc CXX=g++-5 CC=gcc-5 CF=-DCOMPILE_TESTS=ON
+      env: CXX=g++-5
       addons:
         apt:
           packages:
-            - cmake
             - libhidapi-dev
             - g++-5
           sources: &sources
             - ubuntu-toolchain-r-test
     - os: linux
       dist: trusty
-      env: COMPILER_NAME=gcc CXX=g++-6 CC=gcc-6 CF=-DCOMPILE_TESTS=ON
+      env: CXX=g++-6
       addons:
         apt:
           packages:
-            - cmake
             - libhidapi-dev
             - g++-6
           sources: *sources
     - os: linux
       dist: trusty
-      env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 CF=-DCOMPILE_TESTS=ON
+      env: CXX=clang++-3.8
       addons:
         apt:
           packages:
-            - cmake
             - libhidapi-dev
             - g++-5
             - clang-3.8
           sources: *sources
 
-
-install:
-  - mkdir -p build
-  - cd build
-#  - export CXXFLAGS="${CXX_FLAGS} -Wall -Wextra -Werror" # TODO enable when fixed
-  - ${CXX} --version || true
-  - cmake --version
-  - cmake .. ${CF}
-
 script:
-  - make -j2
+  - make -j
 #  - make test # TODO add library device-less tests

NK_C_API.cc

@@ -1,6 +1,8 @@
 #include <cstring>
+#include <iostream>
 #include "NK_C_API.h"
 #include "include/LibraryException.h"
+#include "include/NitrokeyManager.h"
 #include "include/cxx_semantics.h"
 
 using namespace nitrokey;

NK_C_API.h

@@ -1,15 +1,16 @@
 #ifndef LIBNITROKEY_NK_C_API_H
 #define LIBNITROKEY_NK_C_API_H
 
-#include <iostream>
-#include <string>
-#include "include/NitrokeyManager.h"
-#include "include/inttypes.h"
+#include <inttypes.h>
+#include <stdbool.h>
 
 #define NK_C_API
 
+#ifdef __cplusplus
 extern "C"
 {
+#endif
+
 /**
  * Set debug level of messages written on stderr
  * @param state state=True - all messages, state=False - only errors level
@@ -467,7 +468,9 @@ NK_C_API const char* NK_get_SD_usage_data_as_string();
  */
 NK_C_API int NK_get_progress_bar_value();
 
+#ifdef __cplusplus
 }
+#endif
 
 
 #endif //LIBNITROKEY_NK_C_API_H