projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.7
[fms.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
52233e8
..
3a14d8f
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-48,7
+48,14
@@
src/freenet/captcha/easybmp/EasyBMP_Font.cpp
src/freenet/captcha/easybmp/EasyBMP_Geometry.cpp
\r
src/http/httpthread.cpp
\r
src/http/ipagehandler.cpp
\r
src/freenet/captcha/easybmp/EasyBMP_Geometry.cpp
\r
src/http/httpthread.cpp
\r
src/http/ipagehandler.cpp
\r
+src/http/pages/addpeerpage.cpp
\r
+src/http/pages/announceidentitypage.cpp
\r
+src/http/pages/createidentitypage.cpp
\r
src/http/pages/homepage.cpp
\r
src/http/pages/homepage.cpp
\r
+src/http/pages/localidentitiespage.cpp
\r
+src/http/pages/optionspage.cpp
\r
+src/http/pages/peertrustpage.cpp
\r
+src/http/pages/showcaptchapage.cpp
\r
src/nntp/nntpconnection.cpp
\r
src/nntp/nntplistener.cpp
\r
src/nntp/uwildmat.cpp
\r
src/nntp/nntpconnection.cpp
\r
src/nntp/nntplistener.cpp
\r
src/nntp/uwildmat.cpp
\r
@@
-66,7
+73,8
@@
src/xyssl/sha1.c
ADD_DEFINITIONS(-DTIXML_USE_STL)
\r
\r
IF(CMAKE_COMPILER_IS_GNUCXX)
\r
ADD_DEFINITIONS(-DTIXML_USE_STL)
\r
\r
IF(CMAKE_COMPILER_IS_GNUCXX)
\r
- ADD_DEFINITIONS(-fpermissive)
\r
+ #ADD_DEFINITIONS(-fpermissive)
\r
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
\r
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
\r
\r
ADD_EXECUTABLE(fms ${FMS_SRC})
\r
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
\r
\r
ADD_EXECUTABLE(fms ${FMS_SRC})
\r
@@
-111,9
+119,10
@@
IF(SHTTPD_LIBRARY)
TARGET_LINK_LIBRARIES(fms ${SHTTPD_LIBRARY})
\r
ELSE(SHTTPD_LIBRARY)
\r
MESSAGE(STATUS "Could not find shttpd library. Will compile from included source.")
\r
TARGET_LINK_LIBRARIES(fms ${SHTTPD_LIBRARY})
\r
ELSE(SHTTPD_LIBRARY)
\r
MESSAGE(STATUS "Could not find shttpd library. Will compile from included source.")
\r
- ADD_DEFINITIONS(-DEMBEDDED
-DNO_GUI
)
\r
+ ADD_DEFINITIONS(-DEMBEDDED)
\r
INCLUDE_DIRECTORIES(libs/shttpd/include)
\r
IF(WIN32)
\r
INCLUDE_DIRECTORIES(libs/shttpd/include)
\r
IF(WIN32)
\r
+ ADD_DEFINITIONS(-DNO_GUI)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_win32.c)
\r
ELSE(WIN32)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_unix.c)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_win32.c)
\r
ELSE(WIN32)
\r
SET(SHTTPD_PLATFORM_SRC libs/shttpd/compat_unix.c)
\r