Merge branch 'master' of https://github.com/irungentoo/InsertProjectNameHere

3 files changed, 38 insertions, 0 deletions

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..8918f02d
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: c
+compiler:
+  - gcc
+
+script:
+  - cmake CMakeLists.txt
+  - make -j3
+
+notifications:
+  email: false
+  
+  irc: 
+    channels:
+      - "chat.freenode.net#InsertProjectNameHere"
+    on_success: always
+    on_failure: always
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..26f56e4c
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.6.0)
+project(TOX)
+ 
+set(core_sources
+        core/DHT.c)
+        
+set(test_sources
+        testing/DHT_test.c)
+ 
+add_executable(TOX-app
+        ${core_sources}
+        ${test_sources})
+
+
+if(WIN32)
+        target_link_libraries(TOX-app ws2_32)
+endif(WIN32)
\ No newline at end of file
diff --git a/testing/muh parser.php b/testing/muh parser.php
new file mode 100644
index 00000000..9817a807
--- /dev/null
+++ b/testing/muh parser.php
@@ -0,0 +1,4 @@
+<?php
+$string = file_get_contents("test.json");
+$json_a=json_decode($string,true);
+?>