merge fix

freeminer · Nov 8, 2016 · f557415 · f557415
1 parent e989b6f
commit f557415
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/misc/minetest.exe.manifest → misc/freeminer.exe.manifest b/misc/minetest.exe.manifest → misc/freeminer.exe.manifest
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -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")