ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows Port: 

- Fix compiling for Windows port. (Regression from r4952.)
This commit is contained in:
rogerman 2013-12-30 06:38:54 +00:00
parent dd09eb888d
commit 2b633d1cb3
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desmume/src/addons/slot2_auto.cpp
View File

@ -18,9 +18,7 @@
#include "../slot2.h" #include "../slot2.h"
#include "../registers.h" #include "../registers.h"
#include "../MMU.h" #include "../MMU.h"
#ifdef HOST_WINDOWS
#include "../windows/inputdx.h"
#endif
class Slot2_Auto : public ISlot2Interface class Slot2_Auto : public ISlot2Interface
{ {
@ -45,12 +43,6 @@ public:
mSelectedImplementation = slot2_List[slot2_selected_type]; mSelectedImplementation = slot2_List[slot2_selected_type];
mSelectedImplementation->connect(); mSelectedImplementation->connect();
printf("Slot2 auto-selected device type: %s (0x%02X)\n", mSelectedImplementation->info()->name(), mSelectedImplementation->info()->id()); printf("Slot2 auto-selected device type: %s (0x%02X)\n", mSelectedImplementation->info()->name(), mSelectedImplementation->info()->id());
#ifdef HOST_WINDOWS
Guitar.Enabled = (selection == NDS_SLOT2_GUITARGRIP)?true:false;
Piano.Enabled = (selection == NDS_SLOT2_EASYPIANO)?true:false;
Paddle.Enabled = (selection == NDS_SLOT2_PADDLE)?true:false;
#endif
} }
virtual void disconnect() virtual void disconnect()

6
desmume/src/windows/main.cpp
View File

@ -2419,6 +2419,12 @@ static BOOL LoadROM(const char * filename, const char * physicalName, const char
if (NDS_LoadROM(filename, physicalName, logicalName) > 0) if (NDS_LoadROM(filename, physicalName, logicalName) > 0)
{ {
INFO("Loading %s was successful\n",logicalName); INFO("Loading %s was successful\n",logicalName);
NDS_SLOT2_TYPE selectedSlot2Type = slot2_GetSelectedType();
Guitar.Enabled = (selectedSlot2Type == NDS_SLOT2_GUITARGRIP)?true:false;
Piano.Enabled = (selectedSlot2Type == NDS_SLOT2_EASYPIANO)?true:false;
Paddle.Enabled = (selectedSlot2Type == NDS_SLOT2_PADDLE)?true:false;
LoadSaveStateInfo(); LoadSaveStateInfo();
lagframecounter=0; lagframecounter=0;
UpdateRecentRoms(logicalName); UpdateRecentRoms(logicalName);