[Shared] New and seperate icons for all executables

code/CMakeLists.txt

@@ -333,16 +333,6 @@ if(BuildSPEngine OR BuildJK2SPEngine)
 	source_group("cgame" FILES ${SPEngineCGameFiles})
 	set(SPEngineFiles ${SPEngineFiles} ${SPEngineCGameFiles})
 
-	if(WIN32)
-		set(SPEngineWin32Files
-			"${SPDir}/win32/resource.h"
-			"${SPDir}/win32/winquake.rc"
-			"${SharedDir}/sys/win_manifest.manifest"
-			)
-		source_group("win32" FILES ${SPEngineWin32Files})
-		set(SPEngineFiles ${SPEngineFiles} ${SPEngineWin32Files})
-	endif()
-
 	set(SPEngineSysFiles
 		"${SharedDir}/sys/sys_main.cpp"
 		"${SharedDir}/sys/sys_event.cpp"
@@ -385,14 +375,15 @@ if(BuildSPEngine OR BuildJK2SPEngine)
 
 	# project macro so we can invoke it twice: for jk2 and for ja
 	function(add_sp_project ProjectName Label SPDirName InstallDir Component)
-		if(MakeApplicationBundles)
-			set_source_files_properties(${SPDirName}/macosx/OpenJK.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-			set(SPEngineFiles ${SPEngineFiles} ${SPDirName}/macosx/OpenJK.icns)
-			set_source_files_properties(${SPDirName}/macosx/English.lproj/InfoPlist.strings PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj)
-			set(SPEngineFiles ${SPEngineFiles} ${SPDirName}/macosx/English.lproj/InfoPlist.strings)
-		endif(MakeApplicationBundles)
-
 		if(WIN32)
+			set(SPEngineWin32Files
+				"${SPDirName}/win32/resource.h"
+				"${SPDirName}/win32/winquake.rc"
+				"${SharedDir}/sys/win_manifest.manifest"
+				)
+			source_group("win32" FILES ${SPEngineWin32Files})
+			set(SPEngineFiles ${SPEngineFiles} ${SPEngineWin32Files})
+
 			add_executable(${ProjectName} WIN32 ${SPEngineFiles})
 			if(UseInternalSDL2)
 				if(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -407,6 +398,11 @@ if(BuildSPEngine OR BuildJK2SPEngine)
 			endif()
 		else(WIN32)
 			if(MakeApplicationBundles)
+				set_source_files_properties(${SPDirName}/macosx/OpenJK.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+				set(SPEngineFiles ${SPEngineFiles} ${SPDirName}/macosx/OpenJK.icns)
+				set_source_files_properties(${SPDirName}/macosx/English.lproj/InfoPlist.strings PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj)
+				set(SPEngineFiles ${SPEngineFiles} ${SPDirName}/macosx/English.lproj/InfoPlist.strings)
+
 				add_executable(${ProjectName} MACOSX_BUNDLE ${SPEngineFiles})
 				set_target_properties(${ProjectName} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${SPDirName}/macosx/OpenJKInfo.plist")
 			else(MakeApplicationBundles)

code/win32/winquake.rc

@@ -53,7 +53,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON                    "starwars.ico"
+IDI_ICON1               ICON                    "../../shared/icons/OpenJK_SP.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

codeJK2/win32/winquake.rc

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include <windows.h>
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON1               ICON                    "../../shared/icons/OpenJO.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+#include "../../code/qcommon/game_version.h"
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION VERSION_MAJOR_RELEASE,VERSION_MINOR_RELEASE,VERSION_EXTERNAL_BUILD,VERSION_INTERNAL_BUILD
+ PRODUCTVERSION VERSION_MAJOR_RELEASE,VERSION_MINOR_RELEASE,VERSION_EXTERNAL_BUILD,VERSION_INTERNAL_BUILD
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "Raven Software"
+            VALUE "CompanyName", "Activision Inc"
+            VALUE "FileDescription", "OpenJO"
+            VALUE "FileVersion",  VERSION_STRING
+            VALUE "InternalName", "JASP"
+            VALUE "LegalCopyright", "Copyright (C) 2013"
+            VALUE "OriginalFilename", "jasp.exe"
+            VALUE "ProductName", "OpenJO"
+            VALUE "ProductVersion",  VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+

codemp/CMakeLists.txt

@@ -531,7 +531,6 @@ if(BuildMPEngine)
 
 	if(WIN32)
 		set(MPEngineWin32Files
-			"${MPDir}/win32/icon.ico"
 			"${MPDir}/win32/resource.h"
 			"${MPDir}/win32/openjk.rc"
 			"${SharedDir}/sys/win_manifest.manifest"

codemp/win32/openjk.rc

@@ -54,7 +54,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON                    "icon.ico"
+IDI_ICON1               ICON                    "../../shared/icons/OpenJK.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

codemp/win32/openjkded.rc

@@ -54,7 +54,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON                    "icon.ico"
+IDI_ICON1               ICON                    "../../shared/icons/openjkcmd.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //

shared/icons/license.txt

@@ -1,8 +1,11 @@
 The OpenJK icon was made by Antonio Aiello and is released under
 the MIT/X11 license, as quoted here.
 
-code*/macosx/OpenJK.icns, code/win32/starwars.ico,
-codemp/win32/icon.ico and shared/sdl/sdl_icon.h are derived works
+Rework was made by SomaZ, no change of the license. 
+
+openjkcmd.ico was contributed by SirYodaJedi
+
+code*/macosx/OpenJK.icns and shared/sdl/sdl_icon.h are derived works
 under the same terms.
 
 ----