Skip to content

Commit 92b0053

Browse files
committed
Update to mainline beta 3
1 parent 62d893a commit 92b0053

File tree

6 files changed

+8
-290
lines changed

6 files changed

+8
-290
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
- name: Dolphin-Build Number
116116
run: |
117117
export LASTCOMMIT=$(git log --pretty=format:%H -1)
118-
export DOLPHINVER="v3.1.2-mainline-beta.2"
118+
export DOLPHINVER="v3.1.2-mainline-beta.3"
119119
echo "DOLPHIN Build $DOLPHINVER"
120120
echo "DOLPHINVER=$DOLPHINVER" >> $GITHUB_ENV
121121
gsed -i "s|\${DOLPHIN_WC_DESCRIBE}|$DOLPHINVER|g" Source/Core/Common/scmrev.h.in
@@ -262,7 +262,7 @@ jobs:
262262
- name: Dolphin-Build Number
263263
run: |
264264
export LASTCOMMIT=$(git log --pretty=format:%H -1)
265-
export DOLPHINVER="v3.1.2-mainline-beta.2"
265+
export DOLPHINVER="v3.1.2-mainline-beta.3"
266266
echo "DOLPHIN Build $DOLPHINVER"
267267
echo "DOLPHINVER=$DOLPHINVER" >> $GITHUB_ENV
268268
sed -i "s|\${DOLPHIN_WC_DESCRIBE}|$DOLPHINVER|g" Source/Core/Common/scmrev.h.in

Source/Core/Common/make_scmrev.h.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var oFS = new ActiveXObject("Scripting.FileSystemObject");
33

44
var outfile = "./scmrev.h";
55
var cmd_revision = " rev-parse HEAD";
6-
var cmd_describe = " describe --always --long --dirty";
6+
var cmd_describe = " describe --always --long"; // "--dirty" removed from here while we're using a patch for SDL; will likely be fixed in the future
77
var cmd_branch = " rev-parse --abbrev-ref HEAD";
88
var cmd_commits_ahead = " rev-list --count HEAD ^master";
99
var cmd_get_tag = " describe --exact-match HEAD";

Source/Core/DolphinQt/DolphinQt.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
</ImportGroup>
2020
<PropertyGroup Label="UserMacros" />
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
22-
<TargetName>Project-Plus-Dolphin</TargetName>
22+
<TargetName>Dolphin</TargetName>
2323
</PropertyGroup>
2424
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
25-
<TargetName>Project-Plus-Dolphin</TargetName>
25+
<TargetName>Dolphin</TargetName>
2626
</PropertyGroup>
2727
<ItemDefinitionGroup>
2828
<ClCompile>

Source/Core/DolphinQt/MainWindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,7 @@ void MainWindow::ShowUpdateDialog()
13691369
Common::HttpRequest httpRequest;
13701370

13711371
// Make the GET request
1372-
auto response = httpRequest.Get("https://api.github.com/repos/Motobug/Project-Plus-Dolphin/releases/latest");
1372+
auto response = httpRequest.Get("https://api.github.com/repos/Project-Plus-Development-Team/Project-Plus-Dolphin/releases/latest");
13731373

13741374
if (response)
13751375
{
@@ -1406,7 +1406,7 @@ void MainWindow::CheckForUpdatesAuto()
14061406
Common::HttpRequest httpRequest;
14071407

14081408
// Make the GET request
1409-
auto response = httpRequest.Get("https://api.github.com/repos/Motobug/Project-Plus-Dolphin/releases/latest");
1409+
auto response = httpRequest.Get("https://api.github.com/repos/Project-Plus-Development-Team/Project-Plus-Dolphin/releases/latest");
14101410

14111411
if (response)
14121412
{

Source/Core/DolphinQt/MainWindow_new.h

Lines changed: 0 additions & 282 deletions
This file was deleted.

Source/Core/DolphinQt/MenuBar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ void MenuBar::AddHelpMenu()
651651
});
652652
QAction* github = help_menu->addAction(tr("&GitHub Repository"));
653653
connect(github, &QAction::triggered, this, []() {
654-
QDesktopServices::openUrl(QUrl(QStringLiteral("https://github.com/Motobug/Project-Plus-Dolphin")));
654+
QDesktopServices::openUrl(QUrl(QStringLiteral("https://github.com/Project-Plus-Development-Team/Project-Plus-Dolphin")));
655655
});
656656

657657
#ifndef __APPLE__

0 commit comments

Comments
 (0)