reorganized a lot of stuff and modified mapgen and objects slightly while doing it

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f912f68cd2862c0569ab927bade352a36f14ead3..84726945691261aaacbcba5f5a772cb8af8ef42a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,13 +35,24 @@ else()
                find_package(JPEG REQUIRED)
                find_package(BZip2 REQUIRED)
                find_package(PNG REQUIRED)
+               if(APPLE)
+                       FIND_LIBRARY(CARBON_LIB Carbon)
+                       FIND_LIBRARY(COCOA_LIB Cocoa)
+                       FIND_LIBRARY(IOKIT_LIB IOKit)
+                       mark_as_advanced(
+                               CARBON_LIB
+                               COCOA_LIB
+                               IOKIT_LIB
+                       )
+                       SET(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${CARBON_LIB} ${COCOA_LIB} ${IOKIT_LIB})
+               endif(APPLE)
        endif(BUILD_CLIENT)
        find_package(ZLIB REQUIRED)
        set(PLATFORM_LIBS -lpthread)
        #set(CLIENT_PLATFORM_LIBS -lXxf86vm)
        # This way Xxf86vm is found on OpenBSD too
        find_library(XXF86VM_LIBRARY Xxf86vm)
-       set(CLIENT_PLATFORM_LIBS ${XXF86VM_LIBRARY})
+       set(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${XXF86VM_LIBRARY})
 endif()
 
 configure_file(
@@ -50,6 +61,13 @@ configure_file(
 )
 
 set(common_SRCS
+       content_sao.cpp
+       mapgen.cpp
+       content_inventory.cpp
+       content_nodemeta.cpp
+       content_craft.cpp
+       content_mapblock.cpp
+       content_mapnode.cpp
        auth.cpp
        collision.cpp
        nodemetadata.cpp
@@ -85,10 +103,12 @@ set(common_SRCS
 # Client sources
 set(minetest_SRCS
        ${common_SRCS}
+       content_cao.cpp
+       mapblock_mesh.cpp
+       farmesh.cpp
        keycode.cpp
        clouds.cpp
        clientobject.cpp
-       guiFurnaceMenu.cpp
        guiMainMenu.cpp
        guiMessageMenu.cpp
        guiTextInputMenu.cpp
@@ -114,6 +134,7 @@ include_directories(
        ${CMAKE_BUILD_TYPE}
        ${PNG_INCLUDE_DIR}
        "${PROJECT_SOURCE_DIR}/jthread"
+       "${PROJECT_SOURCE_DIR}/sqlite"
 )
 
 set(EXECUTABLE_OUTPUT_PATH ../bin)
@@ -132,6 +153,7 @@ if(BUILD_CLIENT)
                ${PLATFORM_LIBS}
                ${CLIENT_PLATFORM_LIBS}
                jthread
+               sqlite3
        )
 endif(BUILD_CLIENT)
 
@@ -142,6 +164,7 @@ if(BUILD_SERVER)
                ${ZLIB_LIBRARIES}
                ${PLATFORM_LIBS}
                jthread
+               sqlite3
        )
 endif(BUILD_SERVER)
 
@@ -170,15 +193,22 @@ else()
        # Probably GCC
        
        if(WARN_ALL)
-               set(WARNING_FLAGS "-Wall")
+               set(RELEASE_WARNING_FLAGS "-Wall")
        else()
-               set(WARNING_FLAGS "")
+               set(RELEASE_WARNING_FLAGS "")
+       endif()
+       
+       if(NOT APPLE)
+               set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
+       endif()
+       
+       if(APPLE)
+               set(CMAKE_OSX_ARCHITECTURES i386 CACHE STRING "do not build for 64-bit" FORCE)
+               set(ARCH i386)
        endif()
 
-       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
-
-       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
-       set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall")
+       set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} ${WARNING_FLAGS} -O3 -ffast-math -Wall -fomit-frame-pointer -pipe -funroll-loops")
+       set(CMAKE_CXX_FLAGS_DEBUG "-g -O1 -Wall ${WARNING_FLAGS}")
 
        if(USE_GPROF)
                set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
@@ -225,5 +255,6 @@ endif(BUILD_SERVER)
 # Subdirectories
 
 add_subdirectory(jthread)
+add_subdirectory(sqlite)
 
 #end