archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-22 12:21:41 +02:00
Code Issues Projects Releases Packages Wiki Activity
23450 commits 5 branches 11 tags 1.3 GiB
Commit graph

752 commits

Author SHA1 Message Date
Ryan Houdek
5911dd528a Merge pull request #2361 from JosJuice/filesystem-read32 
Remove CFileSystemGCWii::Read32
 2015-05-25 23:40:28 -04:00
Ryan Houdek
4ba430951a Merge pull request #2439 from JosJuice/company-from-id 
Use an ID-to-name map when volume has no company string
 2015-05-25 23:32:55 -04:00
Ryan Houdek
1d6375b71f Merge pull request #2339 from JosJuice/fix-wii-fst-size 
Fix reading Wii FST size
 2015-05-25 23:27:25 -04:00
Tillmann Karras
30ebb2459e Set copyright year to when a file was created 2015-05-25 13:22:31 +02:00
Tillmann Karras
cefcb0ace9 Update license headers to GPLv2+ 2015-05-25 13:22:31 +02:00
JosJuice
d2e6adb045 Use an ID-to-name map when volume has no company string 
This is written so that the result of GetCompanyFromID never is cached
(except on Android?). Caching is unnecessary because the string can be
obtained quickly at runtime, and not caching it means that the cache
doesn't have to be invalidated when GetCompanyFromID is edited.
 2015-05-24 17:41:53 +02:00
Lioncash
383b104af0 WiiWad: Use correct form of delete for arrays 2015-05-22 17:52:54 -04:00
JosJuice
bad09fc358 Volume: Rename GetName to GetInternalName 
This is intended to better separate it from GetNames and to clarify
that this name originally wasn't meant to be shown to users.
The ISOProperties GUI is also updated, mainly because labeling
the long banner name "short name" was confusing.
 2015-05-11 11:19:30 +02:00
JosJuice
2d5d5fa83e Read opening.bnr to get names from Wii discs 
This makes Dolphin display the same names as the Disc Channel.
 2015-05-03 15:58:35 +02:00
JosJuice
272f9d3cbc FileSystemGCWii: Allow reading files partially 2015-05-03 15:44:24 +02:00
JosJuice
0d9ca081bb Remove CFileSystemGCWii::Read32 
A function that does the same thing was added to IVolume in 4cd00e3.
 2015-05-03 11:39:20 +02:00
JosJuice
ee694e327a Get rid of banner loaders and move their functionality to volumes 
Having some data available in banner loaders and some other data
data available in volumes gets messy, especially with GetNames(),
which is available in both but returns different results
depending on which one is used. This change drops support
for reading names and descriptions from Wii save data.
 2015-04-28 23:44:29 +02:00
JosJuice
04fcb72e0b Fix reading Wii FST size 2015-04-28 17:20:33 +02:00
JosJuice
d43a920924 Filesystem: Return file list reference instead of modifying argument 2015-04-28 12:48:05 +02:00
JosJuice
235ecfbed7 Return GetNames languages, to avoid hardcoded language lists in callers 
This makes the code cleaner and also leads to some user-visible changes:

The wx game properties will no longer let the user
select WAD languages that don't have any names.

The Qt game list will now display names using the languages
set in the configuration instead of always using
English for PAL GC games and Japanese for WADs.

If a WAD doesn't have a name in the user's preferred language,
English is now selected as a fallback before Japanese.
 2015-04-23 08:14:39 +02:00
Lioncash
f5c72c5b1a DiscIO: Add a missing header to Volume.h 2015-04-20 21:10:31 -04:00
Matthew Parlane
571eee8648 Merge pull request #2225 from JosJuice/remove-volumehandler 
Get rid of VolumeHandler
 2015-04-21 11:18:57 +12:00
Stevoisiak
7c1ab2911a Move down Country_World 
The countries are sorted alphabetically. This should have been changed
when the variable was renamed from Country_International to
Country_World
 2015-04-08 18:55:16 -04:00
JosJuice
4cd00e366c Get rid of VolumeHandler 
VolumeHandler is basically just a wrapper around a single IVolume object.
This change moves that object to DVDInterface, moves the Read32
function to IVolume, and gets rid of the rest of VolumeHandler.
 2015-04-05 10:09:48 +02:00
Michael Ehrenreich
9387603fcf Improve error handling in DiscIO::CompressFileToBlob and DecompressBlobToFile 2015-03-17 09:01:26 +01:00
JosJuice
66bb3000c2 Don't construct NANDContentLoader classes before Main.cpp runs 
The cUIDsys constructor writes to <Wii user path>/sys/uid.sys.
This must not be done before Main.cpp sets the correct user paths.
 2015-03-09 16:08:32 +01:00
Lioncash
b7514955e5 Merge pull request #2113 from Stevoisiak/VolumeCleanup 
Basic volume code cleanup
 2015-03-05 12:18:53 -05:00
JosJuice
96c4b332f6 FileMonitor: Check log level in addition to FileMonitor checkbox 
This is good for performance when FileMontior is selected
but the log level only is set to notice or warning.
The ability to do this wasn't available until recently:
1ed41672f5
 2015-03-03 11:33:16 +01:00
Stevoisiak
492aa5c391 DiscIO: Get rid of unsafe cast 2015-02-28 22:03:53 -05:00
Stevoisiak
5346e791bc VolumeWad: change titlever to title_version 2015-02-28 21:42:16 -05:00
Stevoisiak
eff924e9e2 General Formatting 2015-02-28 19:33:27 -05:00
Stevoisiak
ede4977d12 VolumeWiiCrypted: Implement IsDiscTwo() 
Allows us to check if a Wii game is marked as Disc 2.
 2015-02-26 17:10:18 -05:00
Stevoisiak
f72a559958 Rearranged Volume header files 2015-02-26 16:57:32 -05:00
Stevoisiak
06cb85991e De-capitalized CountryCode 2015-02-26 16:57:31 -05:00
Stevoisiak
df2f6d137e VolumeWad: Move country identification to GetCountry() 
Brings the code more in line with the rest of the game volume code
 2015-02-26 16:55:17 -05:00
Stevoisiak
d3190ec4f1 VolumeWad: Private variables for offset values 2015-02-26 16:55:16 -05:00
skidau
793abccb5e Merge pull request #1942 from Buddybenj/No-Intro 
Replace Country Names With No-Intro Names
 2015-02-23 12:56:28 +11:00
Markus Wick
95c48b2be7 Merge pull request #2018 from JosJuice/gameini-region-wildcard 
Support game INIs that match all regions
 2015-02-21 15:47:57 +01:00
Buddybenj
265a21a565 Replace Country Names With No-Intro Names 2015-02-17 18:50:10 -06:00
skidau
61b19bda3e Merge pull request #2042 from unknownbrackets/gcz-fix 
DiscIO: On decompress to file, write last blocks correctly
 2015-02-14 13:46:06 +11:00
Pierre Bourdon
4ceae57713 Merge pull request #2015 from Stevoisiak/WAD-Version-Check 
VolumeWad: Return version number for WADs
 2015-02-13 22:09:30 +01:00
Unknown W. Brackets
df5857b5af DiscIO: On decompress to file, write last blocks. 2015-02-12 20:30:11 -08:00
JosJuice
e186104960 Don't use revision-specific unique ID strings outside of CoreParameter 2015-02-11 19:01:04 +01:00
magumagu
0f96a0104e Merge pull request #1752 from Buddybenj/clean-up 
Clean Up
 2015-02-10 11:39:14 -08:00
JosJuice
28b441ebea VolumeWiiCrypted: Replace some hardcoded values with constants 2015-02-08 10:31:17 +01:00
Stevoisiak
b578abfbaa VolumeWad: Return version number for WADs 2015-02-05 11:27:57 -05:00
JosJuice
521ccd7b44 VolumeWiiCrypted: Decryption optimization 
The block doesn't have to be read if it already is in m_pBuffer.
 2015-01-26 15:59:25 +01:00
Benjamin Przybocki
4f324ad742 Clean Up 2015-01-24 17:10:21 -06:00
Ryan Houdek
80e6367e46 Merge pull request #1869 from Stevoisiak/GeneralConsistency 
Minor consistency changes
 2015-01-21 13:46:53 -06:00
Ryan Houdek
f9fc9d47c0 Merge pull request #1895 from JosJuice/isvolumewiidisc 
Don't read from disk when checking volume type
 2015-01-21 13:45:28 -06:00
skidau
6f61f90dab Merge pull request #1777 from JosJuice/filemonitor-volumedirectory 
Add FileMonitor support for VolumeDirectory
 2015-01-20 12:32:42 +11:00
JosJuice
ace060748b Don't read from disk when checking volume type 
Should be faster than relying on the OS to cache the magic words.
Also gets rid of the odd recursive call in VolumeDirectory.
 2015-01-17 13:21:02 +01:00
Stevoisiak
f31b688cf5 More minor consistency changes 2015-01-12 22:28:12 -05:00
Matthew Parlane
b3474c8218 Merge pull request #1796 from Stevoisiak/cacheRevisionNote 
Added CACHE_REVISION warnings
 2015-01-13 08:36:50 +13:00
Tres Walsh
e3e290123b Fix compiler error for win64 (SFileInfo doesn't get used much so a copy won't kill us) 2015-01-11 15:59:50 -08:00
Tres Walsh
8ee601d32b Fix variable name ambiguity 2015-01-11 13:54:20 -08:00
Tres Walsh
9e541f6d2d Reduce number of allocations in CFileSystemGCWii::BuildFilenames 
Modify SFileInfo to use a default move constructor, and no copy constructor.
Modify SFileInfo to use member initializers.
 2015-01-11 13:42:50 -08:00
Stevoisiak
fe49427688 Additional CACHE_REVISION increment warnings 
GameFile.cpp warnings for DolphinQt,
ISOFile.cpp warnings for DolphinWX
 2015-01-11 00:25:36 -05:00
JosJuice
358183e34a Fix 4.0-4901 VolumeDirectory stack overflow 
I actually fixed this once, but then I broke it in a
failed attempt to optimize. VolumeHandler::IsWii calls
CVolumeDirectory::Read(0x18, 4, &MagicWord, false);
 2015-01-09 22:50:07 +01:00
skidau
3738d27b24 Merge pull request #1776 from JosJuice/cleanrip-wii-discs 
Fix CleanRip reading Wii discs
 2015-01-03 10:42:51 +11:00
Stevoisiak
2e1d8d7ac0 Added identifier for country code 'B' 
Only used by the American version of Ufouria: The Saga
 2014-12-30 19:57:14 -05:00
JosJuice
bb93336ecf DiscIO: Replace "raw" functions with "decrypt" parameters 
This is intended to make decryption look less implicit in the code.
 2014-12-28 10:35:48 +01:00
JosJuice
7f04a23e23 Add FileMonitor support for VolumeDirectory 2014-12-27 20:13:31 +01:00
JosJuice
72f8f243c7 Never decrypt data when using DI command 0xA8 
CleanRip relies on this when ripping Wii discs.
 2014-12-27 13:49:25 +01:00
JosJuice
1618d31523 FileMonitor: Get rid of "GC" from names and comments 2014-12-25 11:12:04 +01:00
JosJuice
8624461315 Re-add FileMonitor support for Wii discs 
This in done in the same way as GC discs, unlike the previous implementation.
 2014-12-25 11:01:18 +01:00
JosJuice
467b3e6baf DiscIO: Clear error status when reading file 2014-12-14 13:16:21 +01:00
Lioncash
f14f0caea6 DiscIO: Remove some explicit deletes 2014-12-04 11:39:20 -05:00
skidau
b9b3277fb5 Merge pull request #1618 from JosJuice/dvd-low-open-partition 
Fix Wii disc partitions
 2014-12-03 21:24:56 +11:00
JosJuice
a2566bd397 DiscIO: Safety check when allocating memory for TMD 2014-12-03 10:54:09 +01:00
magumagu
4bb48d09dd DiskIO: Clean up GetTMD() API. 2014-11-30 16:38:13 +01:00
magumagu
b1df4e5986 Make DVDLowOpenPartition actually change partitions. 2014-11-30 16:01:05 +01:00
Unknown W. Brackets
815b7bec96 DiscIO: Change a memset() to zero initialization. 2014-11-27 11:12:17 -08:00
Unknown W. Brackets
f54bf81520 DiscIO: Avoid zeroing buffer when compressing gcz. 
This saves 6% time.
 2014-11-27 08:58:09 -08:00
Unknown W. Brackets
2635e7d9ea DiscIO: Decompress to file using a larger buffer. 
This improves performance by around 20% for me, and the memory use impact
is negligible considering Dolphin is otherwise unusable.
 2014-11-27 08:34:44 -08:00
Unknown W. Brackets
f2f83a0c60 DolphinWX: Allow cancelling gcz compression. 2014-11-27 07:53:28 -08:00
Stevoisiak
6da394a4d0 More formatting and consistency fixes 2014-11-24 17:16:59 -05:00
Steven Vascellaro
695bbac36a Removed SDK flag 
SDK is not an official Nintendo country code, and is not actually used
by any official software.
 2014-11-18 19:44:17 -05:00
Stevoisiak
f1a26ff654 Various country flag improvements 
* Added country flags for games from Netherlands and Spain
* Added separate category for Region Free games (Uses European flag as placeholder)
* Added missing country filter options in "show regions" menu
* Rearranged country filters for readability
* Incremented CACHE_REVISION

Also fixed various country filters not showing up as options in the "Show regions" menu.
 2014-11-18 19:44:16 -05:00
Rachel Bryk
fa18518cef Fix reading wii revisions. 2014-11-15 00:39:54 -05:00
Rachel Bryk
fa5e3ec292 Implement GetRevision() for wii disks. 2014-11-14 21:06:26 -05:00
Stevoisiak
b25e1a2eb4 Various formatting and consistency fixes 2014-11-13 22:42:18 -05:00
comex
7747c9efbb Merge pull request #1429 from lioncash/concat 
FileSystemGCWii: Shorten some string concatenations
 2014-10-28 23:38:58 -04:00
comex
3247f28048 Merge pull request #1430 from lioncash/voldir 
VolumeDirectory: Pass std::string by reference for SetUniqueID/SetName
 2014-10-28 23:38:21 -04:00
Stevoisiak
00620ea729 Added flags for Russia and Australia 2014-10-28 23:04:24 -04:00
Lioncash
56bc58b9f4 VolumeDirectory: Pass std::string by reference for SetUniqueID/SetName 2014-10-28 14:18:54 -04:00
Lioncash
d1d70c1a7d FileSystemGCWii: Shorten some string concatenations 
Just does it all on one line instead.
 2014-10-28 13:41:42 -04:00
Lioncash
00b3cc3b09 VolumeCreator: Make master key arrays static 
Only used within this translation unit.
 2014-10-12 15:07:39 -04:00
Lioncash
6cfa579870 VolumeGC: Use regular return type declaration for GetStringDecoder 2014-10-07 21:15:14 -04:00
Rohit Nirmal
46057db37d Fix build failing when disabling precompiled headers. 2014-09-19 18:17:51 -04:00
Lioncash
4db2af2d42 DiscIO: Remove unnecessary break statements. 2014-09-12 11:34:34 -04:00
skidau
4cb25633e1 Merge pull request #1048 from lioncash/discio 
DiscIO: Minor changes to VolumeDirectory.
 2014-09-12 11:31:29 +10:00
Lioncash
b06ec302d1 Remove some unnecessary semicolons 2014-09-11 13:05:31 -04:00
Lioncash
9601f5ec5f DiscIO: Get rid of some casts and a c_str call in VolumeDirectory 2014-09-09 19:01:20 -04:00
Lioncash
b34f2a78f5 DiscIO: Simplify GetUniqueID in VolumeDirectory 2014-09-09 18:57:45 -04:00
Rohit Nirmal
fbc64984ca Include CommonTypes.h instead of Common.h. 2014-09-08 15:39:58 -04:00
shuffle2
9302218a19 Merge pull request #851 from lioncash/logg 
Common: Kill off duplicate log warning definitions
 2014-09-06 12:35:19 -07:00
Lioncash
690ed8580c Common: Kill off duplicate log warning definitions 
Also embed the log checks rather than using macros
 2014-09-06 15:11:29 -04:00
Rohit Nirmal
cf8d1c9197 FileHandlerARC: Remove FileHandlerARC. 2014-09-05 12:53:41 -04:00
Rohit Nirmal
a3d9b22c27 BannerLoaderWii: Removed #if 0'd code. 2014-09-05 12:52:29 -04:00
shuffle2
532b7bb7da Merge pull request #893 from rohitnirmal/scan-build-fixes 
Scan build fixes
 2014-09-02 23:15:18 -07:00
Shawn Hoffman
266992684d msvc: remove some remnants of SDL and DSound from projects and general cleanup. 2014-09-01 21:27:44 -07:00
Lioncash
1977ea42ae DiscIO: Prefix class member variables with "m_" 2014-09-01 15:48:02 -04:00
Lioncash
4cb46879bc DiscIO: Move some raw pointers over to unique_ptr 2014-08-31 14:48:57 -04:00
Lioncash
55a0034dd5 DiscIO: Clean up brace placements 2014-08-30 18:06:43 -04:00
Lioncash
77aef014a0 Merge pull request #909 from lioncash/void 
Get rid of C-style empty function parameter indicators
 2014-08-30 15:28:47 -04:00
Lioncash
1d706b2311 Get rid of C-style empty function parameter indicators 2014-08-30 15:23:48 -04:00
Lioncash
cee3362e33 DiscIO: Get rid of unnecessary struct differencing 2014-08-29 20:07:55 -04:00
Lioncash
6955e023a0 Merge pull request #877 from lioncash/voldir 
DiscIO: Move VolumeDirectory off of raw pointers
 2014-08-28 04:11:33 -04:00
Rohit Nirmal
9e340b1c81 Initialize variables to silence garbage return warning from scan-build. 2014-08-27 20:35:20 -05:00
Lioncash
5082afa670 DiscIO: Move VolumeDirectory off of raw pointers 2014-08-26 00:23:16 -04:00
Lioncash
f18fec81fe DiscIO: Make the unordered set in IsSoundFile static 
Doesn't need to be instantiated every time the function is called.
 2014-08-25 19:56:09 -04:00
Shawn Hoffman
f1b82a34b2 Windows: Use a shared precompiled header for dolphin code under Source/ 2014-08-14 23:51:13 -07:00
Lioncash
4fa71dd59e Remove fakepoll.h. 
It was only used for Windows XP and lower.

This also bumps the _WIN32_WINNT define in the stdafx precompiled headers to set the minimum version as Windows Vista.
 2014-07-26 22:53:40 -04:00
Scott Mansell
d4a2afe345 Fix another protential issue with casting. 
Another issue from #334 with the casting moved from the output of
min to it's inputs.

This is a non-issue on 64 bit machines, but if dolphin is compiled
on an OS with size_t == u32 (say ARM) then remainingSize could be
truncated.

Restored the casting to the original order before #334.
 2014-07-15 01:38:05 +12:00
degasus
6d3f249dcc mark all local variables as static 2014-07-11 16:10:20 +02:00
degasus
22e1aa5bb4 mark all local functions as static 2014-07-11 16:07:23 +02:00
Tillmann Karras
d3fa8a6167 Reorder class initializer lists 2014-07-04 03:53:22 +02:00
Lioncash
0332d4d76f Merge pull request #539 from jordan-woyak/fix-extract-directory 
Fix ISO Directory extraction.
 2014-06-29 21:35:46 -04:00
Lioncash
f78b94077e DiscIO: Centralize the banner pointer and validity boolean into IBannerLoader 
These are both used within the banner loaders, and IsValid is exactly the
same. So this makes sense.
 2014-06-29 15:40:18 -04:00
Lioncash
d800b5fb74 DiscIO: Fix extra tabs in the banner loader headers 2014-06-29 15:31:44 -04:00
Jordan Woyak
3805c4967f Fix ISO Directory extraction. 2014-06-29 14:22:06 -05:00
Lioncash
ca5340ebde Centralize the logging code into its own folder in Common. 2014-06-25 22:11:42 -04:00
Lioncash
8b13afbb8e Remove the 32-bit config platform from the VS solution and projects 2014-06-24 22:07:26 -04:00
Lioncash
ce54c1e571 Kill off replaceable usages of s[n]printf. 2014-06-18 19:53:38 -04:00
Paul Olszewski
5d793881b0 Fix the capitalization of "GameCube" throughout the project. 2014-06-08 11:24:49 +09:00
Lioncash
49b0eef393 Remove the min/max functions in CommonFuncs. 
The algorithm header has the same functions.
 2014-05-29 21:44:41 -04:00
Pierre Bourdon
664c8d30a0 Remove all trailing whitespaces from our codebase. 2014-03-29 11:05:44 +01:00
Ryan Houdek
5310d6d2ea Fix a crash that got recently introduced. 
When CFileSystemGCWii::GetFileName can't find a valid filename it would return nullptr.
nullptr as a std::string throws an assert within the std lib.
So return an empty string and check if it is empty or not
 2014-03-23 22:29:30 -05:00
Lioncash
bd1ce18f90 Simplify file tree building for the filesystem view. 
Technically this also simplifies on disc filename building in general.
 2014-03-16 16:54:00 -04:00
Lioncash
f325fc9634 Clean up FileHandlerARC.cpp/.h 
- Removed parentheses from the returns.
- Put the function declaration headers back on a single line.
- Make FindFileInfo's parameter a const string reference.
 2014-03-15 02:14:49 -04:00
Lioncash
a82675b7d5 Kill off some usages of c_str. 
Also changes some function params, but this is ok.
Some simplifications were also able to be made (ie. killing off strcmps with ==, etc).
 2014-03-14 13:51:23 -04:00
Matthew Parlane
31cfc73a09 Fixes spacing for "for", "while", "switch" and "if" 
Also moved && and || to ends of lines instead of start.
Fixed misc vertical alignments and some { needed newlining.
 2014-03-11 00:35:07 +13:00
Matthew Parlane
e05eca71ea Merge pull request #149 from lioncash/filemonitor-song-types 
Add more sound file extensions to FileMonitor's IsSoundFile.
 2014-03-10 13:45:23 +13:00
Tillmann Karras
d802d39281 clang-modernize -use-nullptr 
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
 2014-03-09 21:14:26 +01:00
Tillmann Karras
f28116b7da clang-modernize -add-override 2014-03-09 21:12:01 +01:00
Tillmann Karras
c89f04a7c5 clang-modernize -loop-convert 
and some manual adjustments
 2014-03-09 21:11:59 +01:00
Lioncash
b027c4d64e Add more sound file extensions to FileMonitor's IsSoundFile. 2014-03-09 12:46:01 -04:00
lioncash
2c8b9735ae Add two other formats to the list of extensions in IsSoundFile 
.adx is used in various games, so this should definitely be here.
 2014-03-04 08:57:07 -05:00
lioncash
f39c757edf Simplify ShowSound() in FileMonitor.cpp. 
Now if more sound types are found, they just need to simply be added to
the unordered set.

- Also changed ShowSound() to IsSoundFile()
- Fixed IsSoundFile’s definition in FileMonitor.h. This whole time it
has been defined as a void method, when in reality it was a bool
function.

- Changed the FileMonitor’s string parameters to be constant references.
 2014-03-04 08:39:25 -05:00
Tillmann Karras
315a8ba1c0 Various changes suggested by cppcheck 
- remove unused variables
- reduce the scope where it makes sense
- correct limits (did you know that strcat()'s last parameter does not
  include the \0 that is always added?)
- set some free()'d pointers to NULL
 2014-02-28 12:43:20 +01:00
Tillmann Karras
6914eca167 Fix various warnings reported by clang 
- mostly remove unused variables
- rename some generic JIT identifiers
 2014-02-28 12:28:19 +01:00
Pierre Bourdon
c698c07755 Make DiscIO/ mostly IWYU clean (and fix errors in rest of the project detected by this change). 2014-02-22 23:37:29 +01:00
Pierre Bourdon
8ea8da6ebc Fix more header sorting issues in DiscIO/ (now check-includes clean). 2014-02-20 01:01:10 +01:00
Lioncash
2afe215271 Convert all includes to relative paths. 2014-02-18 02:19:10 -05:00
Lioncash
3fd87a7636 Second and final pass of clearing out tabs. 2014-02-17 02:19:41 -05:00
Lioncash
6c4ee1753a Fix some vertical alignments 
ie. uses spaces for alignment.
 2014-02-16 20:12:05 -05:00
Jordan Woyak
d6f6672522 Kill auto usage in CISOBlob.cpp per request. 2014-02-13 16:09:58 -06:00
Jordan Woyak
cec8ac20fc Fixed issue 7020. CISO >4GB failure. Caused by integer overflow. 2014-02-13 15:47:42 -06:00
Tillmann Karras
404624bf0b Turn loops into range-based form 
and some things suggested by cppcheck and compiler warnings.
 2014-02-13 09:05:50 +01:00
lioncash
d2038049f5 Replace all include guard ifdefs with "#pragma once" 2014-02-10 18:07:16 -05:00
Matthew Parlane
32bfcc034f Some tidy up of sprintf to StringFromFormat 
Includes a small fix to SetupWiiMemory
 2014-02-10 17:25:18 +13:00
Lioncash
40182a48a5 Cleanup enum indentations. 2014-02-09 16:16:10 -05:00
Pierre Bourdon
e59f770ccb Revert "Merge pull request #49 from Parlane/sprintf_tidy" 
Change broke the build on Debian stable.

This reverts commit 28755439b3, reversing
changes made to 64e01ec763.
 2014-02-09 16:14:13 +01:00
Matthew Parlane
ebff7974c3 Some tidy up of sprintf to StringFromFormat 2014-02-08 14:32:48 +13:00
Jasper St. Pierre
34692ab826 Remove unnecessary Src/ folders 2013-12-31 14:03:19 -05:00
Jasper St. Pierre
43e618682e Convert all vcxproj files to UNIX line endings 2013-12-31 14:03:18 -05:00
Chanwoong Kim
c405d92c41 fixed issue 6852. 2013-12-07 16:07:47 +09:00
Ryan Houdek
4867937355 Add Read16/Read8 to the CBlobBigEndianReader so the key check is reading 8bit from the correct location to determin which key to use. Also change check to == 1 as suggested in the IRC channel on first implementation. Potentially fixes 6852. 2013-12-06 20:40:12 -06:00
Tillmann Karras
268bdf19ce Fix format string warnings 2013-11-13 04:01:16 +01:00
Ryan Houdek
68ba0f7f4e Add a comment to the magic value reading location. 2013-11-11 17:17:49 +00:00
Chanwoong Kim
22fef0da9b Fixed a bug that incorrectly recognized as 'GameCube'. when you open the Korean Wii Disc, which is re-encrypted with a common-key(g_MasterKey). 2013-11-12 01:05:30 +09:00
Matthew Parlane
e15f628935 Fix {Read,Write}FileToString. 
We should be using binary always.
 2013-11-05 00:33:41 +13:00
comex
21610c2e54 Run code through clang-modernize -add-override to add 'override' decls. 2013-11-03 20:54:05 -05:00
comex
c579637eaf Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
comex
965b32be9c Run code through clang-modernize -loop-convert to create range-based for loops, and manually fix some stuff up. 2013-11-03 20:54:01 -05:00
comex
82729fcc8f Merge remote-tracking branch 'shuffle2/vc12' 
Conflicts:
	Source/Core/Common/Common.vcxproj
	Source/Core/Common/Common.vcxproj.filters
 2013-10-31 16:51:56 -04:00
Ryan Houdek
8e73e8ae5f Wipe all traces of OpenSSL's AES implementation. Use polarssl instead. 2013-10-27 18:27:07 +00:00
Shawn Hoffman
ccd30024b3 Update to VS2013 and a slew of build-related updates. Notes: 
* Currently there is no DEBUGFAST configuration. Defining DEBUGFAST as a preprocessor definition in Base.props (or a global header) enables it for now, pending a better method. This was done to make managing the build harder to screw up. However it may not even be an issue anymore with the new .props usage.
* D3DX11SaveTextureToFile usage is dropped and not replaced.
* If you have $(DXSDK_DIR) in your global property sheets (Microsoft.Cpp.$(PlatformName).user), you need to remove it. The build will error out with a message if it's configured incorrectly.
* If you are on Windows 8 or above, you no longer need the June 2010 DirectX SDK installed to build dolphin. If you are in this situation, it is still required if you want your built binaries to be able to use XAudio2 and XInput on previous Windows versions.
* GLew updated to 1.10.0
* compiler switches added: /volatile:iso, /d2Zi+
* LTCG available via msbuild property: DolphinRelease
* SDL updated to 2.0.0
* All Externals (excl. OpenAL and SDL) are built from source.
* Now uses STL version of std::{mutex,condition_variable,thread}
* Now uses Build as root directory for *all* intermediate files
* Binary directory is populated as post-build msbuild action
* .gitignore is simplified
* UnitTests project is no longer compiled
 2013-10-26 17:55:38 -07:00
Lioncash
207547b425 Clean up includes in DiscIO as much as possible. 
Also turned a long iterator declaration in VolumeDirectory.cpp to using auto in order to shorten it.
 2013-10-19 19:59:02 -04:00
Lioncash
82fd579506 Remove unnecessary include of "../../Core/Src/ConfigManager.h" from BannerLoaderGC.cpp. In actuality, all that was needed here was an include of CommonTypes.h. 
Also change Common.h to CommonTypes in BannerLoaderWii.cpp.
 2013-10-19 19:59:01 -04:00
comex
de1773affb Basic precompiled header support for Linux/OS X. Shaves 20-30% off full rebuild time on my system. 2013-10-17 00:07:35 -04:00
Lioncash
1ec4894bc5 [Common] Abstract out the decode5A3Image and decodeCI8Image functions in BannerLoaderGC, BannerLoaderWii, and GCMemcard into ColorUtil.cpp. Makes for less copied code and remains functionally the same. 2013-10-02 18:18:54 -04:00
comex
f57ff0a569 Support a gcm revision-specific game ini for cheats + partially fix gecko codes in default ini. 
The local ini is not revision-specific because it would require renaming
everything.  Meh.
 2013-09-28 23:38:25 -04:00
comex
bea76ac129 No need to std::move a return value. Thanks Billiard. 2013-09-26 21:15:35 -04:00
comex
18abc33306 2x banner images! 2013-09-25 03:06:27 -04:00
LPFaint99
5d202ae9ea proper fix for issue 6206 2013-09-14 15:09:58 -07:00
comex
4f5729dd59 MSVC warnings. 2013-09-01 22:59:32 -04:00
comex
fd7cf5bb71 A bunch of trivial changes to fix clang warnings. 2013-09-01 22:58:33 -04:00
comex
5209abeb03 Better error reporting for ES / NANDContentLoader. 2013-08-31 23:49:29 -04:00
comex
04c41c1d38 Fix loading DLC using IOCTL_ES_OPENTITLECONTENT & /dev/es state save. 
(Intertwined enough that's it's easier to do in one patch.)

(1) /dev/es did not support state save, which could cause crashes and
    incorrect behavior after loading.

(2) NANDContentLoader tried to read all of a title's contents into
    memory when it was first opened.  Two issues:

- If any contents were missing, it bailed out.  However, with DLC,
  only some of the contents may be downloaded, as determined by the
  permission bits in the ticket.  Instead, return an appropriate error
  when a content is accessed that doesn't exist on the filesystem
  (don't bother checking the permission bits though).

- Everything was loaded into memory - even if it consisted of 3 GB of
  songs, which caused Dolphin to lag out for quite a while (and would
  fail on 32-bit).  Instead, open content on demand.
 2013-08-31 01:38:52 -04:00
Matthew Parlane
59e060aba2 Missed some VS build options. 2013-08-16 21:42:31 +12:00
Matthew Parlane
d6ec6ae97a Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
Matthew Parlane
d8b39b9dcf Support PolarSSL on *nix 
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
 2013-08-15 23:36:17 +12:00
lioncash
d244bca1f5 Fix a bunch of random typos in comments and logging. 
Also update the comment headers for two functions in GCMemcard.cpp.
 2013-04-19 09:21:45 -04:00
Lioncash
bab9963b00 New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects. 2013-04-17 23:09:55 -04:00
John Chadwick
1e6dacf1e4 Make dolphin aware of disc revision numbers. Display them under game properties and use them in netplay. 
Patch by johnwchadwick.
Fixed issue 6243.
 2013-04-16 22:39:05 -05:00
Lioncash
2316cb6876 Remove all tab/space mismatches from the Core project. For anyone working on a branch that heavily involves the core, I am so sorry. 
- Also killed off some trailing spaces/tabs.

- Updated the license header to be consistent with the rest of the project (All projects are now done moving over to this)

- Also, killed some dangling else's (where appropriate)

Now all the tab fixing is done. No more of this crap should be needed to be pushed. Rejoice!
 2013-04-16 23:14:36 -04:00
lioncash
ef85b9af45 Update the license file text (change SVN to Git) in all projects except Core since I was told a merge was happening soon. So for the sake of the merge going smoothly, I'll fix that when I remove the tab/space mismatches from the Core project. 
Also, some tab/space mismatches removed from VideoOGL, and some places I missed in VideoDX[number] projects.

Now, the Core is literally the only project with tab/space mismatches (on a large scale).
 2013-04-15 16:28:55 -04:00
Jordan Woyak
385d8e2b15 ChunkFile has allowed me to accidentally "Do" a non-POD for the last time! 2013-04-09 19:02:22 -05:00
Jordan Woyak
98d35e590e Fixed split WBFS file size display. (probably) 
Fixed issue 6222.
 2013-04-09 12:58:56 -05:00
Lioncash
f432d6038e Fix some typos and correct some capitalizations in the log messages. 
Makes the logging look more orderly and less spammy when spitting out things.
 2013-03-31 19:13:30 -04:00
lioncash
0e3d8e2e9f Clean up some space/tab mismatches in DiscIO and InputCommon. 
Keeps the files consistent.
 2013-03-19 09:59:41 -04:00
lioncash
279e3c7e14 Fix a potential memory leak in function DecompressBlobToFile in CompressedBlob.cpp 2013-03-07 10:59:50 -05:00
Jordan Woyak
33a13b1a37 Fixed issue 5270. Don't ask me how, I just clean up code and then it works! I think it was int overflow. 2013-03-05 00:35:24 -06:00
Jordan Woyak
6b2818199c Fix WAD volume name extracting. 2013-03-03 19:00:29 -06:00
Jordan Woyak
c07b8a6e37 Fix more of what I broke. 2013-03-03 17:08:41 -06:00
Jordan Woyak
aeb4fc9846 Fix what I broke. 2013-03-03 02:12:24 -06:00
Jordan Woyak
6c8adf6130 Eliminate the wstring game name. 
Some cleanup throughout related code. (try to make logic in ISOFile understandable by a human)
Encode strings in UTF-8 rather than somehow trying to determine the encoding in the GUI code.

Non-windows OSes temporarily broken.
 2013-03-02 20:00:36 -06:00
Jordan Woyak
2b1af36900 Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
Jordan Woyak
e079d24912 Kill wstring version of game description. 2013-03-01 22:45:10 -06:00
Matthew Parlane
99cf57eb39 Fixes two memory leaks, one is pretty bad for OSX. 
Yell at pauldachz if this doesn't work.
Or... say thanks.
 2013-03-01 19:21:34 +13:00
Jordan Woyak
536c110b31 Fix "DiscIO" to build with "Unicode". 2013-02-27 20:04:07 -06:00
Ryan Houdek
717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Jordan Woyak
bf4be1d8d1 Change some CNANDContentLoader logic to what was probably intended. Kills some warn logs when opening Dolphin. 2013-02-17 01:57:25 -06:00
Glenn Rice
f7fa33f2d6 Fix remaining compiler warnings. 2013-01-31 15:29:29 -06:00
Glenn Rice
0ffdd2607f Fix the majority of the compiler warnings unearthed by the addition of 
the new warning flags.
 2013-01-29 23:24:51 -06:00
Rachel Bryk
1e006b5b99 Better implementation of revision 2cc1a97a66. Works with .gcz files now. 2013-01-25 21:28:04 -05:00
skidau
7e5d877858 Merge branch 'ES_LAUNCH' 
Games that are now playable:

Back to the Future: The Game
CSI - Hard Evidence
CSI - Deadly Intent
CSI - Fatal Conspiracy
Red Steel
Metroid Prime: Trilogy
Wii Sports + Wii Sports Resort pack
Sam & Max: Season One
Sam & Max: Beyond Time and Space
Kirby's Dream Collection: Classic Collection
Indiana Jones and the Staff of Kings: Fate of Atlantis


* ES_LAUNCH:
  Fixed SSBB from starting at the mini-games screen.
  Build fix
  Corrected a state bug where newly loaded dols did not have their patches applied.
  Changed the HLE system to allow it to hook the beginning, the end or replace the entire function without changing the GC memory.  Fixes Kirby's Return to Dreamland. Added a way to categorise the type of HLE function.  Currently, there are debug, floating point, memory and generic functions. Added a HLE function for OSGetResetCode (Warm reset).  Fixes the CSI games. Added a switch to disable all of the HLE functions if the idle skipping option is disabled.
  Added some IOS version checks and code to clear memory before loading the dol.
  Added support for Reset (from menu).  Fixes Sam & Max.
  Added an IOS check as games which use IOS older than IOS30 do not need to be HLE'd.  Added some stubs for Reset to Menu and SSBB's load from disc partition.  Fixed loading Fate of Atlantis from the Indiana Jones and the Staff of Kings game.
  Added argument detection and passing to the loaded dol.  This fixes the Wii Sports+Wii Sports Resort bundle pack.
  Added preliminary support for ES_LAUNCH (Wii Multi-boot games) by using HLE to hijack the OSBootDol function.

Conflicts:
	Source/Core/DiscIO/Src/FileSystemGCWii.cpp
 2013-01-16 20:22:29 +11:00
Jordan Woyak
a167bccb03 Apparently the order here was important, cached somewhere I guess. 2013-01-10 18:59:15 -06:00
Jordan Woyak
14b8d3f107 Add support for german region flag. Still need to change image. (currently using a copy of europe flag) 2013-01-09 22:53:04 -06:00
Jordan Woyak
6598462aba Display error messages when failing to compress/decompress games. 
Fixes issue 4681.
 2013-01-09 20:02:46 -06:00
Jordan Woyak
32855a289c Actually export 0-sized files. 
Fixes issue 5177.
 2013-01-09 01:31:40 -06:00
skidau
0c845728cc Added support for Reset (from menu). Fixes Sam & Max. 2012-12-26 23:10:40 +11:00
Pierre Bourdon
54fc4029dd Use do { ... } while (0) for the *_LOG macros 
Without this patch, such code would not compile:

if (cond)
    WARN_LOG(FOO, "msg");
else
    WARN_LOG(FOO, "msg2");
 2012-08-20 13:12:49 +02:00
Pierre Bourdon
86a1899b9e Fix a wrong data type in the WBFS Blob reader causing issues on x86 systems 
Fixes issue 5489.
 2012-08-05 19:35:49 +02:00
Pierre Bourdon
04bde406d3 Fix DVD root path for Wii games. Now Wii games can be booted using extracted files instead of a disc image. 2012-05-11 22:19:57 +02:00
Pierre Bourdon
77f47866df Add Wii DVD integrity checking to Dolphin 
This allows users to easily check whether their Wii dump is corrupted or not
using the Dolphin properties window. Right click on a game, Properties,
Filesystem tab, then right click on the game partition and select "Check
partition integrity".

This may have some false negatives due to the unused clusters heuristic (see
the comment in VolumeWiiCrypted.cpp). False positives are unlikely.
 2012-05-04 16:27:42 +02:00
skidau
7885e63deb Added wbfs support. Thanks to lordlyhobo for the patch. Fixes issue 859. 2012-05-04 00:09:01 +10:00
skidau
330f63df80 Corrected the file offset within the FST of virtual disks (used by the DVD Root path function). 2012-04-28 11:21:55 +10:00
Shawn Hoffman
26521aa66a force VolumeDirectory to align files to 32KB (only streaming audio files really need to be aligned...) 2012-04-23 00:50:44 -07:00
Matthew Parlane
404a6b9ba8 Fixes issue 5330. 2012-03-30 20:10:48 -07:00
Shawn Hoffman
56b1373baf Remove scons-related files 2012-03-25 12:55:02 -07:00
Shawn Hoffman
d15740daf1 Merge branch 'wxw3-update' 2012-03-25 12:27:38 -07:00
Shawn Hoffman
fab037446c Forward "raw" reads of GC discs to the normal read function, since they are not encrypted in the first place. 2012-03-22 23:04:45 -07:00
Shawn Hoffman
f7423a0a4f Merge branch 'master' into wxw3-update 
Conflicts:
	Source/Core/DolphinWX/Src/LogWindow.cpp
 2012-03-22 17:57:38 -07:00
Matthew Parlane
2d75d7a8be Fixes issue 5278. Thanks to megazig for finding the bug :) 2012-03-22 21:15:05 +13:00
Shawn Hoffman
c5d746f3d8 remove scons files from VS projects 2012-03-18 06:41:12 -07:00
LPFaint99
8e332948bf less log noise from CNandContentLoader 2012-02-01 00:04:06 -08:00
LPFaint99
3fb42f6bb6 split adding the ticket to its own function (installing a wad) 2012-02-01 00:03:16 -08:00
Shawn Hoffman
bef3d7229e Ensure comment strings in CBannerLoaderWii::SWiiBanner are null-terminated. Fixes issue 5012. 
Signed-off-by: Shawn Hoffman <godisgovernment@gmail.com>
 2012-01-17 23:59:48 -08:00
LPFaint99
825e2ea4df fix an ascii/wxstring in gamelistctrl, replace fromascii("") with wxemptystring, don't push_back 0 at the end of wstrings 2011-12-22 14:28:12 -08:00
LPFaint99
7f4efa094e add the function to read the game name and description from the banner as unicode 2011-12-18 21:56:13 -08:00
LPFaint99
a73ad3554c add the function to read all unicode gamenames from a wad file 2011-12-18 21:42:20 -08:00
Shawn Hoffman
95517a9741 vs2010: Disable LTCG for realz 2011-09-05 09:43:23 -07:00
Glenn Rice
7135dba54e Add the DSPTool and UnitTests to the cmake build. They are optional, and to enable them add -DDSTPTOOL and -DUNITTESTS to the cmake command line. 
Also, don't check to see if a directory is a wad file.  They aren't.  This removes an annoying and invalid debug assertion with the debug build.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7682 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-07-18 01:47:55 +00:00
LPFaint99
b808af1d7f fix infinitely recursive deletion from r7587 and actually update locations of content.map and uid.sys 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7588 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-05 07:42:40 +00:00
LPFaint99
2c4bc6d94c fix a small oversight to changing NAND root, update locations of content.map and uid.sys 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7587 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-05 06:30:01 +00:00
LPFaint99
1fa17b7e29 Potential fix for errors related to 'Not enough free blocks' 
changes fs getusage to return 1 additional inode to account for the directory itself
Fixes save creation for at least two games, R8XE52 (Jurassic: The Hunted), STEETR (Tetris Party Deluxe)
doesnt harm save creation in any games that i tested (about 25)

also it is now possible to boot a nand title by selecting the tmd file using File > Open

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7575 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-06-02 07:04:26 +00:00
LPFaint99
b5212821f8 Fix IOCTL_ES_GETVIEWCNT (uninitialized data) 
GH5 Loads again
use the existing function instead of checking titleid each time a NANDLoader is needed

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7547 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-05-16 22:46:35 +00:00
Soren Jorvang
8cb2443c2f Fix non-Windows build. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7533 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-05-09 07:43:02 +00:00
LPFaint99
1236e584e0 NAND:Consolidate Wad/Directory loading in CNANDContentLoader to one function 
add ticket to CNANDContentLoader
move wad installer to CNANDContentManager
system menu can now be launched from a wad file without being installed first, (return to system menu from another title will still only work if system menu is installed)
cdb.vff: flushed to disc immediately, creates if the file exists but is too small, moved creation to Boot_WiiWad

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7530 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-05-09 05:47:29 +00:00
LPFaint99
c88126233b Update the country code in SysConf when wii system language is changed. 
remove annoying assert for invalid loaders on disc titles.
Fixes issue 4287.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7514 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-05-05 22:38:07 +00:00
Jordan Woyak
021193b22f Use mutexes in LogManager to make it threadsafe, as suggested by beistin's patch. Change some LogManager function names to be consistent with Dolphin's naming conventions. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7433 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-04-01 07:43:02 +00:00
Soren Jorvang
da82d7e178 Reinstate AfterInit(), which is still needed for MacOpenFile() 
to work properly and possibly also wxProgressDialog.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7355 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-16 01:50:46 +00:00
Glenn Rice
5706abf4a1 Hack up hack number 7328, just to get things to compile. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7329 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-11 12:56:26 +00:00
Jordan Woyak
59fd1008ca Wrapped fopen/close/read/write functions inside a simple "IOFile" class. Reading, writing, and error checking became simpler in most cases. It should be near impossible to forget to close a file now that the destructor takes care of it. (I hope this fixes Issue 3635) I have tested the functionality of most things, but it is possible I broke something. :p 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7328 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-11 10:21:46 +00:00
LPFaint99
278cb45eb9 deleting a channel via the wii sysmenu works now 
Implement ES_DELETETICKET & ES_DELETETITLECONTENT


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7292 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-05 05:18:21 +00:00
LPFaint99
708f6f7299 Replace install wii menu option tools to install wad 
Add the option to clear a title from the NANDContentLoader and attempt to reload it
This allows the using the system menu immediately after installing rather than requiring a relaunch

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7290 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-05 05:07:44 +00:00
Soren Jorvang
05719ac81a Move SConscript files out from the Src subdirectories to be 
consistent with the other build systems.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7282 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-03 19:44:56 +00:00
Soren Jorvang
540238cf79 Prepare for the release of Xcode 4, which has working LTO 
with static libraries.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7280 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-03 04:35:03 +00:00
Glenn Rice
a5b471f490 More conversion from char * to std::string. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7266 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-03-01 03:06:14 +00:00
Glenn Rice
ba54fac9eb Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-28 20:40:15 +00:00
Shawn Hoffman
6e4923399e revert r7212 (express users must modify a single line, instead) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7220 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-21 15:17:41 +00:00
Shawn Hoffman
62cb8ebe46 Force dolphin to use the windows7.1sdk (the windows7.1sdk installer is silly and refuses to recognize that vs2010 exists). 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7212 8ced0084-cf51-0410-be5f-012b33b47a6e
 2011-02-20 18:08:20 +00:00