diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index a99057ea..1704a331 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -97,6 +97,10 @@ else() # Unix endif() # Second, register all resources. +if(WIN32) + add_resource(win32/icon.ico RT_ICON_GROUP APP_ICON) + add_resource(win32/manifest.xml RT_MANIFEST APP_MANIFEST) +endif() add_resource(banner.txt) # Third, distribute the resources. diff --git a/src/win32/icon.ico b/res/win32/icon.ico similarity index 100% rename from src/win32/icon.ico rename to res/win32/icon.ico diff --git a/src/win32/manifest.xml b/res/win32/manifest.xml similarity index 100% rename from src/win32/manifest.xml rename to res/win32/manifest.xml diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 488288d3..4179de80 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -129,8 +129,7 @@ set(generated_SOURCES if(WIN32) set(platform_SOURCES - win32/w32main.cpp - win32/resource.rc) + win32/w32main.cpp) set(platform_LIBRARIES comctl32) diff --git a/src/win32/resource.rc b/src/win32/resource.rc deleted file mode 100644 index e402f8b0..00000000 --- a/src/win32/resource.rc +++ /dev/null @@ -1,6 +0,0 @@ - -// we need a manifest if we want visual styles; put in numbers since somethings a bit screwy -// with my SDK install (I don't think I've got *.rh right) -1 24 "manifest.xml" - -4000 ICON "icon.ico"