More windows fixes

This commit is contained in:
David Sansome 2010-03-02 22:02:43 +00:00
parent 72aa271b23
commit 4d3bd03f16
2 changed files with 14 additions and 0 deletions

View File

@ -68,6 +68,13 @@ include_directories(${LASTFM_INCLUDE_DIRS})
# and don't exist on my mingw toolchain
list(REMOVE_ITEM QT_LIBRARIES "-lGLU -lGL")
if (WIN32)
# RC compiler
string(REPLACE "gcc" "windres" CMAKE_RC_COMPILER_INIT ${CMAKE_C_COMPILER})
ENABLE_LANGUAGE(RC)
SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -o <OBJECT> <SOURCE>")
endif(WIN32)
# Subdirectories
add_subdirectory(3rdparty/qtsingleapplication)
add_subdirectory(3rdparty/qxt)

View File

@ -168,6 +168,11 @@ else(APPLE)
endif(WIN32)
endif(APPLE)
# resource file for windows
if(WIN32)
set(CLEMENTINE-WIN32-RESOURCES ../dist/windres.rc)
endif(WIN32)
qt4_wrap_cpp(CLEMENTINE-SOURCES-MOC ${CLEMENTINE-MOC-HEADERS})
qt4_wrap_ui(CLEMENTINE-SOURCES-UI ${CLEMENTINE-UI})
qt4_add_resources(CLEMENTINE-SOURCES-RESOURCE ${CLEMENTINE-RESOURCES} ${CLEMENTINE-QM-RESOURCE})
@ -205,6 +210,8 @@ add_dependencies(clementine_lib qtsingleapplication qxt)
add_executable(clementine
MACOSX_BUNDLE
WIN32
${CLEMENTINE-WIN32-RESOURCES}
main.cpp
)
target_link_libraries(clementine clementine_lib)