new hotbar, more minecraft-like

[dragonfireclient.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8325024ee72a5bf1b7a27b6ff608e0be51cb0169..b8a36918768e44c80ff75136cb16f60baef7838f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,8 +10,12 @@ add_definitions ( -DUSE_CMAKE_CONFIG_H )
 
 if(WIN32)
        # Windows
-       # Surpress some useless warnings
-       add_definitions ( /D "_CRT_SECURE_NO_DEPRECATE" /W1 )
+       if(MSVC) # MSVC Specifics
+               # Surpress some useless warnings
+               add_definitions ( /D "_CRT_SECURE_NO_DEPRECATE" /W1 )
+       else() # Probably MinGW = GCC
+               set(PLATFORM_LIBS ws2_32.lib)
+       endif()
        # Zlib stuff
        set(ZLIB_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/../../zlib/zlib-1.2.5"
                        CACHE PATH "Zlib include directory")
@@ -30,7 +34,10 @@ else()
        endif(BUILD_CLIENT)
        find_package(ZLIB REQUIRED)
        set(PLATFORM_LIBS -lpthread)
-       set(CLIENT_PLATFORM_LIBS -lXxf86vm)
+       #set(CLIENT_PLATFORM_LIBS -lXxf86vm)
+       # This way Xxf86vm is found on OpenBSD too
+       find_library(XXF86VM_LIBRARY, Xxf86vm)
+       set(CLIENT_PLATFORM_LIBS ${XXF86VM_LIBRARY})
 endif()
 
 configure_file(
@@ -73,6 +80,7 @@ set(minetest_SRCS
        guiPauseMenu.cpp
        irrlichtwrapper.cpp
        client.cpp
+       tile.cpp
        main.cpp
 )