diff options
| author | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-09-28 11:28:15 +0200 |
|---|---|---|
| committer | Tomas Chvatal (scarabeus) <tomas.chvatal@gmail.com> | 2008-09-28 11:28:15 +0200 |
| commit | 466c7cf3e3e37ef765b491b98fad674a7b9d4de1 (patch) | |
| tree | 96545f555e01d055805de3363c0199dd45ad7123 /src | |
| parent | d907acb48b0b281822c020625215b83e7ae76eff (diff) | |
Remove windows quirks from CMake system.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | src/modules/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1210f1..4dd1a92 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -11,34 +11,23 @@ ELSE ( Server ) ELSE ( NO_Audio ) LINK_LIBRARIES ( ${ZZIP_LIBRARY} ${SDL_LIBRARY} ${SDLMIXER_LIBRARY} ${SDLIMAGE_LIBRARY} ${SDLTTF_LIBRARY} ) ENDIF ( NO_Audio ) -ENDIF ( Server ) -IF ( Win ) - IF ( NLS ) - LINK_LIBRARIES ( ${LIB_ZZIP} {LIB_GETTEXT} ${LIB_INTL} ${LIB_GETTEXTPO} ${LIBGETTEXTSRC} ) - ENDIF ( NLS ) - LINK_LIBRARIES ( wsock32 ) -ELSE ( Win ) LINK_LIBRARIES ( SDLmain ) -ENDIF ( Win ) +ENDIF ( Server ) + ############################################################################### # SOURCE SPECIFICATION ############################################################################### # Command for finding correct file names in directory, replace DIR with # directory name you want eg: base # find ./ -maxdepth 1 -type f -name \*.c |grep "$" |sed -e 's/^\.\//\$\{WORKDIR\}\/DIR\//' -e 's/\.c//' |tr '\n' ' ' - -# ugly hack -#IF ( Win ) SET ( SRC_base ${SRC_base} ${WORKDIR}/net/udp ${WORKDIR}/net/tcp ${WORKDIR}/base/udp_server ) -#ELSE ( Win ) # SET ( SRC_base # ${SRC_base} # ${WORKDIR}/net/tcp # ${WORKDIR}/base/tcp_server ) -#ENDIF ( Win ) SET ( SRC_base ${SRC_base} ${WORKDIR}/base/main ${WORKDIR}/base/shot @@ -132,4 +121,4 @@ ENDIF ( NOT Server ) INSTALL ( TARGETS ${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} ) -################################################################################
\ No newline at end of file +################################################################################ diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 3b4f2d8..d1bc4b0 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -4,9 +4,6 @@ # LINKING ( for modules ) ############################################################################### LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ) -IF ( Win ) - LINK_LIBRARIES ( wsock32 ) -ENDIF ( Win ) ############################################################################### # SOURCE SPECIFICATION ############################################################################### @@ -77,4 +74,4 @@ INSTALL ( TARGETS modTeleport INSTALL ( TARGETS modAI LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${APPNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) -###############################################################################
\ No newline at end of file +############################################################################### |