From 96c0b8760e46116b69cb6da1815d05179d088877 Mon Sep 17 00:00:00 2001 From: Pieter van der Kloet Date: Mon, 12 Mar 2012 02:31:37 +0100 Subject: [PATCH] Got rid of the console showing up on Windows and removed libpng stuff --- apps/launcher/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt index f0e5eba948..a34ad7429c 100644 --- a/apps/launcher/CMakeLists.txt +++ b/apps/launcher/CMakeLists.txt @@ -41,10 +41,11 @@ source_group(launcher FILES ${LAUNCHER} ${LAUNCHER_HEADER} ${LAUNCHER_HEADER_MOC find_package(Qt4 REQUIRED) set(QT_USE_QTGUI 1) -if (NOT APPLE) # this dependency can be completely removed, but now it only tested on OS X - find_package(PNG REQUIRED) - include_directories(${PNG_INCLUDE_DIR}) -endif() +# Set some platform specific settings +if(WIN32) + set(GUI_TYPE WIN32) + set(QT_USE_QTMAIN TRUE) +endif(WIN32) QT4_ADD_RESOURCES(RCC_SRCS resources.qrc) QT4_WRAP_CPP(MOC_SRCS ${LAUNCHER_HEADER_MOC}) @@ -53,6 +54,7 @@ include(${QT_USE_FILE}) # Main executable add_executable(omwlauncher + ${GUI_TYPE} ${LAUNCHER} ${RCC_SRCS} ${MOC_SRCS} @@ -62,7 +64,6 @@ target_link_libraries(omwlauncher ${Boost_LIBRARIES} ${OGRE_LIBRARIES} ${QT_LIBRARIES} - ${PNG_LIBRARY} components )