Added #define WATER_ALPHA in content_mapnode.cpp

[oweals/minetest.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fcdb3ccbc16c81d2c69df0dda8ff9840d9a92b73..9c3b0960adbd7a62b0fd28d88dd6a502d409cfef 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(minetest-delta)
+project(minetest)
 cmake_minimum_required( VERSION 2.6 )
 
 if(RUN_IN_PLACE)
@@ -127,8 +127,14 @@ set(common_SRCS
        test.cpp
        sha1.cpp
        base64.cpp
+       ban.cpp
 )
 
+# This gives us the icon
+if(WIN32 AND MSVC)
+       set(common_SRCS ${common_SRCS} winresource.rc)
+endif()
+
 # Client sources
 set(minetest_SRCS
        ${common_SRCS}
@@ -168,7 +174,7 @@ include_directories(
        ${SQLITE3_INCLUDE_DIR}
 )
 
-set(EXECUTABLE_OUTPUT_PATH ../bin)
+set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
 
 if(BUILD_CLIENT)
        add_executable(${PROJECT_NAME} ${minetest_SRCS})
@@ -204,6 +210,8 @@ endif(BUILD_SERVER)
 # Set some optimizations and tweaks
 #
 
+include(CheckCXXCompilerFlag)
+
 if(MSVC)
        # Visual Studio
 
@@ -230,8 +238,11 @@ else()
                set(RELEASE_WARNING_FLAGS "")
        endif()
        
-       if(NOT APPLE)
-               set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
+       if(NOT APPLE AND NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+               CHECK_CXX_COMPILER_FLAG("-Wno-unused-but-set-variable" HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
+               if(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
+                       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-unused-but-set-variable")
+               endif(HAS_UNUSED_BUT_SET_VARIABLE_WARNING)
        endif()
        
        if(APPLE)