X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=CMakeLists.txt;h=4585bbc6fc0b4bd99462ca3a1ba821ba701f5459;hb=f2545574af789b63fc655decfe31a3d9f1b30504;hp=27de288d1e99c2c6df9744d44079783aa7250923;hpb=822f84f5dac64183c556bd86fea8cd7b0527f528;p=fms.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27de288..4585bbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,33 +18,29 @@ src/base64.cpp
 src/bitmapvalidator.cpp
 src/board.cpp
 src/boardlist.cpp
-src/db
 src/dbconversions.cpp
 src/dbmaintenancethread.cpp
 src/dbsetup.cpp
 src/fmsapp.cpp
-src/freenet
 src/global.cpp
 src/hex.cpp
-src/http
 src/ipaddressacl.cpp
 src/localidentity.cpp
 src/main.cpp
 src/message.cpp
 src/messagelist.cpp
-src/nntp
+src/messagethread.cpp
 src/option.cpp
 src/optionssetup.cpp
 src/socketdefines.cpp
 src/stringfunctions.cpp
-src/threadwrapper
+src/threadbuilder.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/captcha
 src/freenet/fcpv2.cpp
 src/freenet/fileinserter.cpp
 src/freenet/fmsversionrequester.cpp
@@ -71,7 +67,6 @@ src/freenet/trustlistinserter.cpp
 src/freenet/trustlistrequester.cpp
 src/freenet/trustlistxml.cpp
 src/freenet/unkeyedidcreator.cpp
-src/freenet/captcha/easybmp
 src/freenet/captcha/simplecaptcha.cpp
 src/freenet/captcha/easybmp/EasyBMP.cpp
 src/freenet/captcha/easybmp/EasyBMP_Font.cpp
@@ -81,7 +76,6 @@ src/http/httpthread.cpp
 src/http/identityexportxml.cpp
 src/http/ipagehandler.cpp
 src/http/multipartparser.cpp
-src/http/pages
 src/http/pages/addpeerpage.cpp
 src/http/pages/announceidentitypage.cpp
 src/http/pages/boardspage.cpp
@@ -89,6 +83,10 @@ src/http/pages/confirmpage.cpp
 src/http/pages/controlboardpage.cpp
 src/http/pages/createidentitypage.cpp
 src/http/pages/execquerypage.cpp
+src/http/pages/forumcreatepostpage.cpp
+src/http/pages/forummainpage.cpp
+src/http/pages/forumthreadspage.cpp
+src/http/pages/forumviewthreadpage.cpp
 src/http/pages/homepage.cpp
 src/http/pages/insertedfilespage.cpp
 src/http/pages/localidentitiespage.cpp
@@ -98,9 +96,9 @@ src/http/pages/peermaintenancepage.cpp
 src/http/pages/peertrustpage.cpp
 src/http/pages/recentlyaddedpage.cpp
 src/http/pages/showcaptchapage.cpp
+src/http/pages/showimagepage.cpp
 src/http/pages/versioninfopage.cpp
 src/nntp/extensiontrust.cpp
-src/nntp/mime
 src/nntp/nntpconnection.cpp
 src/nntp/nntplistener.cpp
 src/nntp/uwildmat.cpp
@@ -120,8 +118,12 @@ ENDIF(DO_CHARSET_CONVERSION)
 IF(ALTERNATE_CAPTCHA)
 	SET(FMS_SRC ${FMS_SRC} 
 	src/freenet/captcha/alternatecaptcha1.cpp
+	src/freenet/captcha/alternatecaptcha2.cpp
+	src/freenet/captcha/alternatecaptchafonts.cpp
 	src/freenet/captcha/freeimage/bitmap.cpp
 	src/freenet/captcha/freeimage/font.cpp)
+ELSE(ALTERNATE_CAPTCHA)
+	MESSAGE(STATUS "You are using the old captcha generator.  Add a -D ALTERNATE_CAPTCHA=ON to the command line to use the alternate captcha generator.")
 ENDIF(ALTERNATE_CAPTCHA)
 
 IF(NOT I_HAVE_READ_THE_README)
@@ -169,7 +171,7 @@ FIND_LIBRARY(ICONV_LIBRARY NAMES iconv iconv_s libiconv libiconv_s)
 IF(ALTERNATE_CAPTCHA)
 	FIND_FILE(FREEIMAGE_LIBRARY NAMES libfreeimage.a PATHS /usr/lib/)
 	IF(NOT FREEIMAGE_LIBRARY)
-		FIND_LIBRARY(FREEIMAGE_LIBRARY NAMES FreeImage libFreeImage libfreeimage)
+		FIND_LIBRARY(FREEIMAGE_LIBRARY NAMES FreeImage libFreeImage libfreeimage freeimage)
 	ENDIF(NOT FREEIMAGE_LIBRARY)
 ENDIF(ALTERNATE_CAPTCHA)
 
@@ -207,6 +209,7 @@ IF(NOT WIN32)
 ENDIF(NOT WIN32)
 
 IF(SQLITE3_LIBRARY)
+	MESSAGE(STATUS "Linking against system SQLite3 library.")
 	TARGET_LINK_LIBRARIES(fms ${SQLITE3_LIBRARY})
 ELSE(SQLITE3_LIBRARY)
 	IF(NOT USE_BUNDLED_SQLITE)