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.

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

Make DolphinQT2 the default project in dolphin-emu.sln #7019

Merged
merged 1 commit into from Jun 2, 2018

Conversation

Ebola16
Copy link
Member

@Ebola16 Ebola16 commented May 30, 2018

The first project in dolphin-emu.sln is the default project unless overridden by the .suo file. This PR makes DolphinQT2 the default project. I needed to unload and reload the DolphinWX project after making these changes to build DolphinWX.exe as the non-default .exe so I'm not sure if this method is correct.

Fixes https://forums.dolphin-emu.org/Thread-compiling-dolphinqt2

@spycrab

@Ebola16 Ebola16 mentioned this pull request May 30, 2018
Copy link
Contributor

@spycrab spycrab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from that, LGTM.

@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinQt2", "Core\DolphinQt2\DolphinQt2.vcxproj", "{FA3FA62B-6F58-4B86-9453-4D149940A066}"

This comment was marked as off-topic.

@Ebola16
Copy link
Member Author

Ebola16 commented May 30, 2018

@spycrab is the new version what you meant? I don't know why we'd call the QT2 project DolphinWX...

@ghost
Copy link

ghost commented May 30, 2018

@Ebola16 Qt version of Dolphin is named just Dolphin now, the executable and the labels such as in Solution Explorer, but it's still DolphinQt2 in the raw code. For the Wx version the Wx suffix remains everywhere.

@spycrab
Copy link
Contributor

spycrab commented May 30, 2018

@Ebola16 Yeah, sorry. Dunno why I wrote that under this line. LGTM now. Would rather have someone else have a look too though.

@Ebola16
Copy link
Member Author

Ebola16 commented May 30, 2018

Fine with me, thanks!

@leoetlino leoetlino merged commit f09f83c into dolphin-emu:master Jun 2, 2018
@Ebola16 Ebola16 deleted the VSQT branch June 2, 2018 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants