Blob Blame History Raw
diff -up cdogs-sdl-0.6.2-2/CMakeLists.txt~ cdogs-sdl-0.6.2-2/CMakeLists.txt
--- cdogs-sdl-0.6.2-2/CMakeLists.txt~	2016-07-21 11:50:15.000000000 +0200
+++ cdogs-sdl-0.6.2-2/CMakeLists.txt	2016-08-12 14:03:18.826614494 +0200
@@ -106,7 +106,7 @@ else()
 		endif()
 	endif()
 	if(NOT BEOS AND NOT HAIKU)
-		add_definitions(-Winline -Werror)
+		add_definitions(-Winline)
 		set(EXTRA_LIBRARIES "m")
 	endif()
 endif()
@@ -192,24 +192,10 @@ INSTALL(DIRECTORY
 	${CMAKE_SOURCE_DIR}/graphics
 	${CMAKE_SOURCE_DIR}/music
 	${CMAKE_SOURCE_DIR}/sounds
-	DESTINATION ${INSTALL_PREFIX})
+	DESTINATION ${CDOGS_DATA_DIR})
 INSTALL(FILES
 	${CMAKE_SOURCE_DIR}/cdogs_icon.bmp
-	${CMAKE_SOURCE_DIR}/README.md
-	DESTINATION ${INSTALL_PREFIX})
-IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/build/linux/cdogs-sdl.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/cdogs-sdl.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons)
-elseif(WIN32)
-	# Package for Windows
-	FILE(GLOB DLLS "${CMAKE_SOURCE_DIR}/src/*.dll")
-	FOREACH(DLL ${DLLS})
-		INSTALL(FILES "${DLL}" DESTINATION ${INSTALL_PREFIX}/bin)
-	ENDFOREACH()
-	install(DIRECTORY ${CMAKE_SOURCE_DIR}/build/licenses DESTINATION ${INSTALL_PREFIX})
-elseif(APPLE)
-	set(CMAKE_INSTALL_PREFIX "/Applications/cdogs-sdl")
-endif()
+	DESTINATION ${CDOGS_DATA_DIR})
 
 # Packaging
 SET(CPACK_PACKAGE_NAME "C-Dogs SDL")