diff --git a/360/main.c b/360/main.c
index 879aa5947d..888ac0ef06 100644
--- a/360/main.c
+++ b/360/main.c
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
xdk360_video_init();
menu_init();
- //menu_loop();
+ menu_loop();
char arg1[] = "ssnes";
char arg2[] = "d:\\roms\\mario.sfc";
diff --git a/360/media/ssnes_main.xui b/360/media/ssnes_main.xui
index 967c853b43..8b9cabd3c1 100644
--- a/360/media/ssnes_main.xui
+++ b/360/media/ssnes_main.xui
@@ -1,56 +1,35 @@
-1920.000000
-1080.000000
+1280.000000
+720.000000
XuiScene1
410.000000
251.000000
-759.300476,475.907898,0.000000
-SSNESMain
+439.013489,260.875977,0.000000
+MyMainScene
XuiBtnRomBrowser
-366.486145
+215.000000
38.000000
-21.158449,37.046692,0.000000
+76.000000,91.000000,0.000000
ROM Browser
-
-
-XuiBtnSettings
-366.200134
-38.000000
-21.799990,94.799988,0.000000
-Settings
-
-
-
-
-XuiBtnQuit
-362.600098
-38.000000
-22.799988,154.800049,0.000000
-Quit
-
-
-
-XuiText1
+XuiTxtTitle
240.000000
40.000000
-770.766418,417.813141,0.000000
+81.453644,55.000000,0.000000
SSNES 360
-0xff1054ce
+0xff0f0f0f
0x800f0f0f
-24.000000
-Arial Unicode MS
-21
+
diff --git a/360/media/ssnes_main_skin.xui b/360/media/ssnes_scene_skin.xui
similarity index 100%
rename from 360/media/ssnes_main_skin.xui
rename to 360/media/ssnes_scene_skin.xui
diff --git a/360/menu.cpp b/360/menu.cpp
index 6701450376..5240683926 100644
--- a/360/menu.cpp
+++ b/360/menu.cpp
@@ -26,14 +26,14 @@ HXUIOBJ hMainScene;
/* Register custom classes */
HRESULT CSSNES::RegisterXuiClasses (void)
{
- CSSNESMain::Register();
+ CMyMainScene::Register();
return S_OK;
}
/* Unregister custom classes */
HRESULT CSSNES::UnregisterXuiClasses (void)
{
- CSSNESMain::Unregister();
+ CMyMainScene::Unregister();
return S_OK;
}
@@ -59,13 +59,13 @@ int menu_init (void)
return 1;
}
- hr = app.LoadSkin( L"file://game:/media/ssnes.xzp#..\\..\\360\\media\\ssnes_main_skin.xur");
+ hr = app.LoadSkin( L"file://game:/media/ssnes_scene_skin.xur");
if (FAILED(hr))
{
OutputDebugString("Failed to load skin.\n");
}
- hr = app.LoadFirstScene( L"file://game:/media/ssnes.xzp#..\\..\\360\\media\\ssnes_main.xur", NULL);
+ hr = app.LoadFirstScene( L"file://game:/media/ssnes_main.xur", NULL);
if (FAILED(hr))
{
OutputDebugString("Failed to load first scene.\n");
diff --git a/360/menu.h b/360/menu.h
index a26a0f677c..2aeced8bf9 100644
--- a/360/menu.h
+++ b/360/menu.h
@@ -13,10 +13,10 @@ protected:
virtual HRESULT UnregisterXuiClasses();
};
-class CSSNESMain: public CXuiSceneImpl
+class CMyMainScene: public CXuiSceneImpl
{
public:
- XUI_IMPLEMENT_CLASS(CSSNESMain, L"SSNESMain", XUI_CLASS_SCENE)
+ XUI_IMPLEMENT_CLASS(CMyMainScene, L"MyMainScene", XUI_CLASS_SCENE)
};
int menu_init (void);
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj b/msvc-360/SSNES-360/SSNES-360.vcxproj
index 871bda2584..f7d726b264 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj
@@ -116,7 +116,7 @@
CopyToHardDrive
- $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\ssnes.cfg=$(OutDir)ssnes.cfg
+ $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
true
@@ -139,6 +139,11 @@
$(OutDir)$(ProjectName).pdb
xapilibd.lib;d3d9d.lib;d3dx9d.lib;xgraphicsd.lib;xboxkrnl.lib;xnetd.lib;xaudiod2.lib;xactd3.lib;x3daudiod.lib;xmcored.lib;xbdm.lib;vcompd.lib;%(AdditionalDependencies)
+
+ $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
+ true
+ CopyToHardDrive
+
@@ -164,6 +169,11 @@
true
xapilibi.lib;d3d9i.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3i.lib;x3daudioi.lib;xmcorei.lib;xbdm.lib;vcomp.lib;%(AdditionalDependencies)
+
+ $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
+ true
+ CopyToHardDrive
+
@@ -188,6 +198,11 @@
true
xapilib.lib;d3d9.lib;d3dx9.lib;xgraphics.lib;xboxkrnl.lib;xnet.lib;xaudio2.lib;xact3.lib;x3daudio.lib;xmcore.lib;vcomp.lib;xbdm.lib;%(AdditionalDependencies)
+
+ $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
+ true
+ CopyToHardDrive
+
@@ -213,7 +228,7 @@
CopyToHardDrive
- $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\ssnes.cfg=$(OutDir)ssnes.cfg
+ $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
true
@@ -243,7 +258,8 @@
true
- $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)\ssnes.cfg=$(OutDir)ssnes.cfg
+ $(RemoteRoot)=$(ImagePath);$(RemoteRoot)\media=$(OutDir)media;$(RemoteRoot)=$(OutDir)cfg
+ CopyToHardDrive
@@ -322,25 +338,54 @@
-
+
Document
- xuipkg /nologo /o /d "$(OutDir)media\ssnes.xzp" %(RelativeDir)\*
- $(OutDir)media\ssnes.xzp;
- $(OutDir)media\ssnes.xzp;%(Outputs)
- xuipkg /nologo /d /o "$(OutDir)media\ssnes.xzp" %(RelativeDir)\*
- xuipkg /nologo /d /o "$(OutDir)media\ssnes.xzp" %(RelativeDir)\*
- $(OutDir)media\ssnes.xzp;%(Outputs)
+ $(OutDir)cfg\ssnes.cfg;%(Outputs)
+ copy %(FullPath) $(OutDir)cfg\ssnes.cfg
+ copy %(FullPath) $(OutDir)cfg\ssnes.cfg
+ copy %(FullPath) $(OutDir)cfg\ssnes.cfg
+ $(OutDir)cfg\ssnes.cfg;%(Outputs)
+ $(OutDir)cfg\ssnes.cfg;%(Outputs)
+ $(OutDir)cfg\ssnes.cfg;%(Outputs)
+ $(OutDir)cfg\ssnes.cfg;%(Outputs)
+ $(OutDir)cfg\ssnes.cfg;%(Outputs)
+ copy %(FullPath) $(OutDir)cfg\ssnes.cfg
+ copy %(FullPath) $(OutDir)cfg\ssnes.cfg
+ copy %(FullPath) $(OutDir)cfg\ssnes.cfg
-
+
Document
- $(OutDir)ssnes.cfg;%(Outputs)
- copy %(FullPath) $(OutDir)ssnes.cfg
- copy %(FullPath) $(OutDir)ssnes.cfg
- copy %(FullPath) $(OutDir)ssnes.cfg
- $(OutDir)ssnes.cfg;%(Outputs)
- $(OutDir)ssnes.cfg;%(Outputs)
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_scene_skin.xui" "$(OutDir)media\ssnes_scene_skin.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_scene_skin.xui" "$(OutDir)media\ssnes_scene_skin.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_scene_skin.xui" "$(OutDir)media\ssnes_scene_skin.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_scene_skin.xui" "$(OutDir)media\ssnes_scene_skin.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_scene_skin.xui" "$(OutDir)media\ssnes_scene_skin.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_scene_skin.xui" "$(OutDir)media\ssnes_scene_skin.xur"
+ $(OutDir)media\ssnes_scene_skin.xur;
+ $(OutDir)media\ssnes_scene_skin.xur;
+ $(OutDir)media\ssnes_scene_skin.xur;
+ $(OutDir)media\ssnes_scene_skin.xur;
+ $(OutDir)media\ssnes_scene_skin.xur;
+ $(OutDir)media\ssnes_scene_skin.xur;
+
+
+
+
+ Document
+ $(OutDir)media\ssnes_main.xur;
+ $(OutDir)media\ssnes_main.xur;
+ $(OutDir)media\ssnes_main.xur;
+ $(OutDir)media\ssnes_main.xur;
+ $(OutDir)media\ssnes_main.xur;
+ $(OutDir)media\ssnes_main.xur;
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur"
+ xui2bin /D /NOLOGO "%(RelativeDir)ssnes_main.xui" "$(OutDir)media\ssnes_main.xur"
diff --git a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
index bf540439f5..92fbc22e3e 100644
--- a/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
+++ b/msvc-360/SSNES-360/SSNES-360.vcxproj.filters
@@ -207,11 +207,14 @@
Source Files\media
-
- Source Files\media
-
Source Files
+
+ Source Files\media
+
+
+ Source Files\media
+
\ No newline at end of file