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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52233e8..3a14d8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,14 @@ src/freenet/captcha/easybmp/EasyBMP_Font.cpp
 src/freenet/captcha/easybmp/EasyBMP_Geometry.cpp
 src/http/httpthread.cpp
 src/http/ipagehandler.cpp
+src/http/pages/addpeerpage.cpp
+src/http/pages/announceidentitypage.cpp
+src/http/pages/createidentitypage.cpp
 src/http/pages/homepage.cpp
+src/http/pages/localidentitiespage.cpp
+src/http/pages/optionspage.cpp
+src/http/pages/peertrustpage.cpp
+src/http/pages/showcaptchapage.cpp
 src/nntp/nntpconnection.cpp
 src/nntp/nntplistener.cpp
 src/nntp/uwildmat.cpp
@@ -66,7 +73,8 @@ src/xyssl/sha1.c
 ADD_DEFINITIONS(-DTIXML_USE_STL)
 
 IF(CMAKE_COMPILER_IS_GNUCXX)
-	ADD_DEFINITIONS(-fpermissive)
+	#ADD_DEFINITIONS(-fpermissive)
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 ADD_EXECUTABLE(fms ${FMS_SRC})
@@ -111,9 +119,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)