Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updater: Add new Dolphin Updater icon #10506

Closed
wants to merge 5 commits into from
Closed

Updater: Add new Dolphin Updater icon #10506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79c10e4
WinUpdater: Add new Dolphin Updater icon
Jeffrey-Lim Mar 11, 2022
df84d52
MacUpdater: Add new Dolphin Updater icon
simonmarien Mar 11, 2022
50d0b50
WinUpdater: Reduce contents of WinUpdater.rc
Jeffrey-Lim Mar 11, 2022
cd40f76
WinUpdater: Reformat resource.h
Jeffrey-Lim Mar 11, 2022
a31f116
Merge branch 'dolphin-emu:master' into master
Jeffrey-Lim Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file added Data/Dolphin-installer.icns
View file
Open in desktop
Binary file not shown.
Binary file added Installer/DolphinUpdater.ico
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions Source/Core/MacUpdater/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ set_target_properties(MacUpdater PROPERTIES
target_compile_options(MacUpdater PRIVATE -x objective-c++)

# Copy icon into the bundle
target_sources(MacUpdater PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
target_sources(MacUpdater PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin-installer.icns")
set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin-installer.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)

target_link_libraries(MacUpdater PRIVATE
"-framework Cocoa"
Expand Down Expand Up @@ -68,11 +68,11 @@ if(MACOS_CODE_SIGNING)
# Make file build code sign
add_custom_command(TARGET MacUpdater POST_BUILD
COMMAND test ${MacUpdater_BUNDLE_PATH} || /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY_UPDATER}" --deep --options runtime ${MacUpdater_BUNDLE_PATH})

# Xcode build code sign
add_custom_command(TARGET MacUpdater POST_BUILD
COMMAND test "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/${MacUpdater_NAME}.app" || /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY_UPDATER}" --deep --options runtime "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/${MacUpdater_NAME}.app")

add_custom_command(TARGET MacUpdater POST_BUILD
COMMAND test "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/${MacUpdater_NAME}.app" || /usr/bin/codesign -f -s "${MACOS_CODE_SIGNING_IDENTITY_UPDATER}" --deep --options runtime "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/${MacUpdater_NAME}.app")
endif()
2 changes: 1 addition & 1 deletion Source/Core/MacUpdater/Info.plist.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${MacUpdater_NAME}</string>
<key>CFBundleIconFile</key>
<string>Dolphin.icns</string>
<string>Dolphin-installer.icns</string>
<key>CFBundleIdentifier</key>
<string>com.dolphinteam.dolphin-updater</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand Down
4 changes: 4 additions & 0 deletions Source/Core/WinUpdater/WinUpdater.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
IDI_ICON1 ICON "..\\..\\..\\Installer\\DolphinUpdater.ico"
9 changes: 9 additions & 0 deletions Source/Core/WinUpdater/WinUpdater.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@
<ItemGroup>
<Manifest Include="Updater.exe.manifest" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="WinUpdater.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Installer\DolphinUpdater.ico" />
</ItemGroup>
<Target Name="AfterBuild" Inputs="@(SourceFiles)" Outputs="@(SourceFiles -> '$(BinaryOutputDir)%(Filename)%(Extension)')">
<Message Text="Copy: @(SourceFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
<Copy SourceFiles="@(SourceFiles)" DestinationFolder="$(BinaryOutputDir)" />
Expand Down
12 changes: 11 additions & 1 deletion Source/Core/WinUpdater/WinUpdater.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,18 @@
<ItemGroup>
<ClCompile Include="Main.cpp" />
<ClCompile Include="WinUI.cpp" />
<ClCompile Include="..\UpdaterCommon\UpdaterCommon.cpp" />
</ItemGroup>
<ItemGroup>
<Manifest Include="Updater.exe.manifest" />
</ItemGroup>
</Project>
<ItemGroup>
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="WinUpdater.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="..\..\..\Installer\DolphinUpdater.ico" />
</ItemGroup>
</Project>
16 changes: 16 additions & 0 deletions Source/Core/WinUpdater/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by WinUpdater.rc
//
#define IDI_ICON1 101

// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif