include libev in source

Signed-off-by: xiehuc <[email protected]>
yanglimingcn · Jul 11, 2013 · 92d4b8f · 92d4b8f
1 parent d79bbf2
commit 92d4b8f
Show file tree

Hide file tree

Showing 15 changed files with 6,766 additions and 8 deletions.
diff --git a/cmake/FindEV.cmake b/cmake/FindEV.cmake
diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -28,8 +28,6 @@ set(LWQQ_HEADER
     type.h
     utility.h
     )
-set(OTHER_LIB 
-    )
 add_definitions(-Wall )
 
 include_directories(
@@ -53,10 +51,10 @@ if(UNIX)
 endif(UNIX)
 
 if(WIN32)
-  set(LWQQ_LIST ${LWQQ_LIST} win32.c libev/ev.c libev/event.c)
+  set(LWQQ_LIST ${LWQQ_LIST} win32.c ../libev/ev.c ../libev/event.c)
   set(LWQQ_OTHER_LIBS ${LWQQ_OTHER_LIBS} ws2_32)
   add_definitions(-DEV_STANDALONE)
-  include_directories(libev)
+  include_directories(../libev)
 endif(WIN32)
 
 add_library(lwqq SHARED

diff --git a/lib/internal.h b/lib/internal.h
@@ -2,6 +2,9 @@
 #define LWQQ_INTERNAL_H_H
 #include "type.h"
 #include "json.h"
+#ifdef WIN32
+#include "win32.h"
+#endif
 
 #ifndef LWQQ_ENABLE_SSL
 #define LWQQ_ENABLE_SSL 0

diff --git a/lib/lwdb.c b/lib/lwdb.c
@@ -26,6 +26,7 @@
 #include "logger.h"
 #include "swsqlite.h"
 #include "lwdb.h"
+#include "internal.h"
 
 #define DB_PATH "/tmp/lwqq"
 

diff --git a/lib/type.h b/lib/type.h
@@ -1,4 +1,4 @@
-/**
+/**
  * @file   type.h
  * @author mathslinux <[email protected]>
  * @date   Sun May 20 22:24:30 2012
@@ -15,9 +15,7 @@
 #include <stdarg.h>
 #include "queue.h"
 #include "vplist.h"
-#ifdef WIN32
-#include "win32.h"
-#endif
+
 #define LWQQ_MAGIC 0x4153
 
 #define USE_MSG_THREAD 1

diff --git a/lib/win32.h b/lib/win32.h
@@ -6,4 +6,6 @@ double drand48(void);
 
 int pipe (int filedes [2]);
 
+#define mkdir(a,b) mkdir(a)
+
 #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,6 @@ double drand48(void);

		int pipe (int filedes [2]);

		#define mkdir(a,b) mkdir(a)

		#endif