add static/dynamic library for server_framework, you can use it direc…

…tly at linux
locht710 · Apr 16, 2015 · fa2d075 · fa2d075
1 parent 02c3445
commit fa2d075
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 20 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,14 +5,14 @@
 *.obj
 
 # Compiled Dynamic libraries
-*.so
+#*.so
 *.dylib
 #*.dll
 
 # Compiled Static libraries
 *.lai
 *.la
-*.a
+#*.a
 #*.lib
 
 # Executables
@@ -46,4 +46,4 @@ tinynet.dir/
 tinynet.vcxproj
 tinynet.vcxproj.filters
 ZERO_CHECK.vcxproj.filters
-login/login.vcxproj.filters
+login/login.vcxproj.filters
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ AUX_SOURCE_DIRECTORY( ./proto PROTO_SRC_LIST)
 INCLUDE_DIRECTORIES( . ../easy/src/base ../tinynet ../easy/dep/protobuf/src ./proto ../easy/dep/mongo-c-driver/src/mongoc ../easy/dep/mongo-c-driver/src/libbson/src/bson ../easy/dep/mongo-cxx-driver/src c:/local/boost_1_53_0)
 
 IF(UNIX)
-	ADD_DEFINITIONS(-D__HAVE_SELECT -D__LINUX )
+	ADD_DEFINITIONS(-D__HAVE_EPOLL -D__LINUX -D__DEBUG)
 	SET(CMAKE_CXX_FLAGS "-Wl,--no-as-needed -std=c++11 -pthread") 
 	SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} -O0 -Wall -g -pg -ggdb")
 	SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -O3 -Wall")

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 AUX_SOURCE_DIRECTORY( . SOURCE_DIRECTORY)	
 ADD_EXECUTABLE(core ${SOURCE_DIRECTORY})
-INCLUDE_DIRECTORIES( ../common ../../easy/src/base ../../tinynet ../../easy/dep/protobuf/src ../../easy/dep/mongo-c-driver/src/mongoc ../../easy/dep/mongo-c-driver/src/libbson/src/bson ../../easy/dep/mongo-cxx-driver/src)
+INCLUDE_DIRECTORIES( ../common ../../easy/src/base ../../tinynet ../../easy/dep/protobuf/src ../../easy/dep/mongo-cxx-driver/src)
 
 IF(UNIX)
 	OPTION(USE_32BITS "Compile for 32bits processors(linux only)" OFF)
@@ -16,13 +16,13 @@ IF(UNIX)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")  
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")    
 	ENDIF(USE_32BITS)  
-	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../../easy/dep/protobuf/src/.libs -L../../easy/dep/mongo-c-driver/src/libbson/.libs -L../../easy/dep/mongo-c-driver/.libs -L../../easy/dep/mongo-cxx-driver/build/linux2/normal")
+	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../dep/protobuf/x64/lib -L../dep/mongocxx/x64/lib")
 ELSE(WIN32)
 
 ENDIF(UNIX)
 
 IF(UNIX)
-	TARGET_LINK_LIBRARIES(core tinynet easy protobuf proto bson pthread mongoc-1.0 mongoclient boost_thread boost_regex)
+	TARGET_LINK_LIBRARIES(core tinynet easy protobuf proto pthread mongoclient boost_thread boost_regex)
 ELSEIF(WIN32)
 	#	64 bit
 	TARGET_LINK_LIBRARIES(core ws2_32 tinynet easy ../dep/protobuf/x64/lib/libprotobuf proto ../dep/mongoc/x64/lib/bson-1.0 ../dep/mongoc/x64/lib/mongoc-1.0 ../dep/mongocxx/x64/lib/mongoclient-gd 

diff --git a/dep/jansson/x64/lib/libjansson.a b/dep/jansson/x64/lib/libjansson.a
diff --git a/dep/mongocxx/x64/lib/libmongoclient.a b/dep/mongocxx/x64/lib/libmongoclient.a
diff --git a/dep/protobuf/x64/bin/protoc b/dep/protobuf/x64/bin/protoc
diff --git a/dep/protobuf/x64/lib/libprotobuf.a b/dep/protobuf/x64/lib/libprotobuf.a
diff --git a/dep/protobuf/x64/lib/libprotobuf.so b/dep/protobuf/x64/lib/libprotobuf.so
diff --git a/dep/protobuf/x64/lib/libprotobuf.so.8 b/dep/protobuf/x64/lib/libprotobuf.so.8
diff --git a/dep/protobuf/x64/lib/libprotoc.a b/dep/protobuf/x64/lib/libprotoc.a
diff --git a/dep/protobuf/x64/lib/libprotoc.so b/dep/protobuf/x64/lib/libprotoc.so
diff --git a/env.sh b/env.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 if [ `env | grep -c "LD_LIBRARY_PATH"` -ge 1 ];
  then
-     LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:../easy/dep/protobuf/src/.libs:../easy/dep/mongo-c-driver/src/libbson/.libs:../easy/dep/mongo-c-driver/.libs:../easy/dep/jansson/src/.libs; export LD_LIBRARY_PATH
+     LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:./dep/protobuf/x64/lib:./dep/jansson/x64/lib; export LD_LIBRARY_PATH
 
  else
-     LD_LIBRARY_PATH=/usr/local/lib:../easy/dep/protobuf/src/.libs:../easy/dep/mongo-c-driver/src/libbson/.libs:../easy/dep/mongo-c-driver/.libs:../easy/dep/jansson/src/.libs; export LD_LIBRARY_PATH
+     LD_LIBRARY_PATH=/usr/local/lib:./dep/protobuf/x64/lib:./dep/jansson/x64/lib; export LD_LIBRARY_PATH
  fi
diff --git a/general_proto.sh b/general_proto.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-export LD_LIBRARY_PATH=../easy/dep/protobuf/src/.libs
-../easy/dep/protobuf/src/.libs/protoc -I./ --cpp_out=./ ./proto/transfer.proto
-../easy/dep/protobuf/src/.libs/protoc -I./ --cpp_out=./ ./proto/login.proto
-../easy/dep/protobuf/src/.libs/protoc -I./ --cpp_out=./ ./proto/common.proto
+export LD_LIBRARY_PATH=./dep/protobuf/x64/lib
+./dep/protobuf/x64/bin/protoc -I./ --cpp_out=./ ./proto/transfer.proto
+./dep/protobuf/x64/bin/protoc -I./ --cpp_out=./ ./proto/login.proto
+./dep/protobuf/x64/bin/protoc -I./ --cpp_out=./ ./proto/common.proto
diff --git a/login/CMakeLists.txt b/login/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 AUX_SOURCE_DIRECTORY( . SOURCE_DIRECTORY)	
 ADD_EXECUTABLE(login ${SOURCE_DIRECTORY})
-INCLUDE_DIRECTORIES( ../common ../../easy/src/base ../../tinynet ../../easy/dep/protobuf/src ../../easy/dep/mongo-c-driver/src/mongoc ../../easy/dep/mongo-c-driver/src/libbson/src/bson ../../easy/dep/mongo-cxx-driver/src ../../easy/dep/jansson/src)
+INCLUDE_DIRECTORIES( ../common ../../easy/src/base ../../tinynet ../../easy/dep/protobuf/src ../../easy/dep/mongo-cxx-driver/src ../../easy/dep/jansson/src)
 
 IF(UNIX)
 	OPTION(USE_32BITS "Compile for 32bits processors(linux only)" OFF)
@@ -16,23 +16,23 @@ IF(UNIX)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")  
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")    
 	ENDIF(USE_32BITS)  
-	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../../easy/dep/protobuf/src/.libs -L../../easy/dep/mongo-c-driver/src/libbson/.libs -L../../easy/dep/mongo-c-driver/.libs -L../../easy/dep/mongo-cxx-driver/build/linux2/normal -L../../easy/dep/jansson/src/.libs")
+	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../dep/protobuf/x64/lib -L../dep/mongocxx/x64/lib -L../dep/jansson/x64/lib")
 ELSE(WIN32)
 
 ENDIF(UNIX)
 
 IF(UNIX)
-	TARGET_LINK_LIBRARIES(login tinynet easy protobuf proto jansson bson pthread mongoc-1.0 mongoclient boost_thread boost_regex)
+	TARGET_LINK_LIBRARIES(login tinynet easy protobuf proto jansson pthread mongoclient boost_thread boost_regex)
 ELSEIF(WIN32)
 	#	64 bit
-	TARGET_LINK_LIBRARIES(login ws2_32 tinynet easy ../dep/protobuf/x64/lib/libprotobuf proto ../dep/mongoc/x64/lib/bson-1.0 ../dep/mongoc/x64/lib/mongoc-1.0 ../dep/mongocxx/x64/lib/mongoclient-gd ../dep/jansson/x64/lib/jansson
+	TARGET_LINK_LIBRARIES(login ws2_32 tinynet easy ../dep/protobuf/x64/lib/libprotobuf proto ../dep/mongocxx/x64/lib/mongoclient-gd ../dep/jansson/x64/lib/jansson
 	#	absolute path should add .lib, just like as follows:
 	c:/local/boost_1_53_0/lib64-msvc-11.0/libboost_thread-vc110-mt-gd-1_53.lib 
 	c:/local/boost_1_53_0/lib64-msvc-11.0/libboost_system-vc110-mt-gd-1_53.lib  
 	c:/local/boost_1_53_0/lib64-msvc-11.0/libboost_date_time-vc110-mt-gd-1_53.lib 
 	c:/local/boost_1_53_0/lib64-msvc-11.0/libboost_chrono-vc110-mt-gd-1_53.lib)
 	#	32 bit
-	#TARGET_LINK_LIBRARIES(login tinynet ../../easy/dep/protobuf/vsprojects/Debug/libprotobuf proto ../dep/mongoc/x86/lib/bson-1.0 ../dep/mongoc/x86/lib/mongoc-1.0 ws2_32)
+	#TARGET_LINK_LIBRARIES(login tinynet ../../easy/dep/protobuf/vsprojects/Debug/libprotobuf proto ws2_32)
 ENDIF(UNIX)
 SET(EXECUTABLE_OUTPUT_PATH ../bin)
 

diff --git a/proxy/CMakeLists.txt b/proxy/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(UNIX)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")  
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")    
 	ENDIF(USE_32BITS)  
-	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../../easy/dep/protobuf/src/.libs -L../../easy/dep/jansson/src/.libs")
+	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../dep/protobuf/x64/lib -L../dep/jansson/x64/lib")
 ELSE(WIN32)
 
 ENDIF(UNIX)

diff --git a/test_client/CMakeLists.txt b/test_client/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(UNIX)
 		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")  
 		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")    
 	ENDIF(USE_32BITS)  
-	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../../easy/dep/protobuf/src/.libs")
+	SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} -O0 -Wall -g -ggdb -fpermissive -L../dep/protobuf/x64/lib")
 ELSE(WIN32)
 
 ENDIF(UNIX)