Permalink
Browse files

merge fix

  • Loading branch information...
proller committed Nov 8, 2016
1 parent e989b6f commit f55741512fd4c46d37cd8ce8436cbcb0010b9dce
Showing with 1 addition and 1 deletion.
  1. 0 misc/{minetest.exe.manifest → freeminer.exe.manifest}
  2. +1 −1 src/CMakeLists.txt
File renamed without changes.
View
@@ -863,7 +863,7 @@ set(common_SRCS
# This gives us the icon and file version information
if(WIN32)
set(WINRESOURCE_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/winresource.rc")
set(MINETEST_EXE_MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/minetest.exe.manifest")
set(MINETEST_EXE_MANIFEST_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../misc/freeminer.exe.manifest")
if(MINGW)
if(NOT CMAKE_RC_COMPILER)
set(CMAKE_RC_COMPILER "windres.exe")

0 comments on commit f557415

Please sign in to comment.