X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=CMakeLists.txt;h=5f976acc73cfdf7309636334bbeb30b8fb400e76;hb=ee580d19b7920904587e18d72a3465d52eab6204;hp=52233e8f30acc7f5af540c8bc9aa05a35e7e6a6e;hpb=d8ccfe2b3944adf07d35534459cdda19d15217c8;p=fms.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52233e8..5f976ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,10 +15,14 @@ src/messagelist.cpp
 src/option.cpp
 src/socketdefines.cpp
 src/stringfunctions.cpp
+src/threadcontroller.cpp
 src/uuidgenerator.cpp
 src/db/sqlite3db.cpp
 src/db/sqlite3recordset.cpp
 src/db/sqlite3statement.cpp
+src/freenet/boardlistinserter.cpp
+src/freenet/boardlistrequester.cpp
+src/freenet/boardlistxml.cpp
 src/freenet/fcpv2.cpp
 src/freenet/freenetmasterthread.cpp
 src/freenet/freenetssk.cpp
@@ -29,7 +33,6 @@ src/freenet/identityintroductionxml.cpp
 src/freenet/identityrequester.cpp
 src/freenet/identityxml.cpp
 src/freenet/introductionpuzzleinserter.cpp
-src/freenet/introductionpuzzleremover.cpp
 src/freenet/introductionpuzzlerequester.cpp
 src/freenet/introductionpuzzlexml.cpp
 src/freenet/messageinserter.cpp
@@ -38,6 +41,7 @@ src/freenet/messagelistrequester.cpp
 src/freenet/messagelistxml.cpp
 src/freenet/messagerequester.cpp
 src/freenet/messagexml.cpp
+src/freenet/periodicdbmaintenance.cpp
 src/freenet/trustlistinserter.cpp
 src/freenet/trustlistrequester.cpp
 src/freenet/trustlistxml.cpp
@@ -47,8 +51,21 @@ src/freenet/captcha/easybmp/EasyBMP.cpp
 src/freenet/captcha/easybmp/EasyBMP_Font.cpp
 src/freenet/captcha/easybmp/EasyBMP_Geometry.cpp
 src/http/httpthread.cpp
+src/http/identityexportxml.cpp
 src/http/ipagehandler.cpp
+src/http/pages/addpeerpage.cpp
+src/http/pages/announceidentitypage.cpp
+src/http/pages/boardspage.cpp
+src/http/pages/controlboardpage.cpp
+src/http/pages/createidentitypage.cpp
+src/http/pages/execquerypage.cpp
 src/http/pages/homepage.cpp
+src/http/pages/localidentitiespage.cpp
+src/http/pages/optionspage.cpp
+src/http/pages/peerdetailspage.cpp
+src/http/pages/peermaintenancepage.cpp
+src/http/pages/peertrustpage.cpp
+src/http/pages/showcaptchapage.cpp
 src/nntp/nntpconnection.cpp
 src/nntp/nntplistener.cpp
 src/nntp/uwildmat.cpp
@@ -60,21 +77,51 @@ src/pthreadwrapper/guard.cpp
 src/pthreadwrapper/mutex.cpp
 src/pthreadwrapper/runnable.cpp
 src/pthreadwrapper/thread.cpp
+src/pthreadwrapper/threadedexecutor.cpp
 src/xyssl/sha1.c
 )
 
+IF(WIN32)
+	SET(FMS_PLATFORM_SRC src/fmsservice.cpp)
+ELSE(WIN32)
+	SET(FMS_PLATFORM_SRC src/fmsdaemon.cpp)
+ENDIF(WIN32)
+
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-	ADD_DEFINITIONS(-fpermissive)
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+# was for ZThreads
+#IF(CMAKE_COMPILER_IS_GNUCXX)
+#	#ADD_DEFINITIONS(-fpermissive)
+#	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+#ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+ADD_EXECUTABLE(fms ${FMS_SRC} ${FMS_PLATFORM_SRC})
 
-ADD_EXECUTABLE(fms ${FMS_SRC})
+# link dl - For SQLite3 and shttpd - not for FreeBSD
+IF(CMAKE_COMPILER_IS_GNUCC)
+	IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+		TARGET_LINK_LIBRARIES(fms dl)
+	ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+# add -lcompat only for FreeBSD
+IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		ADD_DEFINITIONS(-lcompat)
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 
+# link ws2_32 for Windows
 IF(WIN32)
 	TARGET_LINK_LIBRARIES(fms ws2_32)
 ENDIF(WIN32)
 
+# add -lxnet and -lsocket on solaris
+IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+	ADD_DEFINITIONS(-lxnet -lsocket)
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+
 FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_s)
 FIND_LIBRARY(TINYXML_LIBRARY NAMES tinyxml tinyxml_s)
 FIND_LIBRARY(PTHREADS_LIBRARY NAMES pthread pthreads pthreadvc2)
@@ -87,9 +134,6 @@ ELSE(SQLITE3_LIBRARY)
 	ADD_LIBRARY(sqlite3 libs/sqlite3/sqlite3.c)
 	TARGET_LINK_LIBRARIES(fms sqlite3)
 	INCLUDE_DIRECTORIES(libs/sqlite3)
-	IF(CMAKE_COMPILER_IS_GNUCC)
-		TARGET_LINK_LIBRARIES(fms dl)
-	ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(SQLITE3_LIBRARY)
 
 IF(TINYXML_LIBRARY)
@@ -111,9 +155,10 @@ IF(SHTTPD_LIBRARY)
 	TARGET_LINK_LIBRARIES(fms ${SHTTPD_LIBRARY})
 ELSE(SHTTPD_LIBRARY)
 	MESSAGE(STATUS "Could not find shttpd library.  Will compile from included source.")
-	ADD_DEFINITIONS(-DEMBEDDED -DNO_GUI)
+	ADD_DEFINITIONS(-DEMBEDDED)
 	INCLUDE_DIRECTORIES(libs/shttpd/include)
 	IF(WIN32)
+		ADD_DEFINITIONS(-DNO_GUI)
 		SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_win32.c)
 	ELSE(WIN32)
 		SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_unix.c)