summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-31 20:04:04 +0200
committerNils Dagsson Moskopp <nils@dieweltistgarnichtso.net>2011-07-31 20:04:04 +0200
commit7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45 (patch)
treeb06cf63fb0c8d01f03c1fb84faa936197029e03f /src/CMakeLists.txt
parent831003156c77c811e7f1fcb65811d1d099587442 (diff)
parent303351de6d2cb54af27198207ba6c8cef49ecf1a (diff)
downloadminetest-7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45.tar.gz
minetest-7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45.tar.bz2
minetest-7ece67727dcc1ff7a6634e4b911eeb82ed3eaf45.zip
Merge remote-tracking branch 'origin/upstream'
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fcdb3ccbc..32177f8a9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -129,6 +129,11 @@ set(common_SRCS
base64.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}