With the current RC-file approach the fonts and the png-icon must be within the game/resources directory. They will be moved to a better location after the RC-stuff is removed.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1326 b956fd51-792f-4845-bead-9b4dfca2ff2c

3 files changed, 33 insertions, 69 deletions

diff --git a/src/ultrastardx.control b/src/ultrastardx.control
deleted file mode 100644
index a1bb17f0..00000000
--- a/src/ultrastardx.control
+++ /dev/null
@@ -1,19 +0,0 @@
-Package: ultrastardx
-Priority: optional
-Section: games
-Installed-Size: 18400
-Maintainer: Jay Binks <jaybinks@gmail.com>
-Architecture: i386
-Version: 1.1.1
-Depends: libc6 (>= 2.1), libsdl1.2debian-alsa, libportaudio2, libavcodec1d, libavformat1d, libsqlite3-0, libsdl-ttf2.0-0,  libsdl-image1.2
-Description: 
- Karaoke Software for PC like Singstar for PS2. 
- It evaluates your singing by analyzing your voice pitch. 
- Songs can be created with integrated Editor. 
- .
- This is a Fork of the UltraStar Project with many massive improvements. 
- .
- http://www.ultrastardeluxe.org/
-
-
-
diff --git a/src/ultrastardx.desktop b/src/ultrastardx.desktop
deleted file mode 100644
index d49f05ef..00000000
--- a/src/ultrastardx.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-
-Name=UltraStar Deluxe
-Comment=Karaoke program that evaluates your performance
-Comment[de]=Singe Karaoke und messe dich mit anderen Spielern
-
-Icon=ultrastardx
-
-TryExec=ultrastardx
-Exec=ultrastardx
-StartupNotify=false
-Terminal=false
-
-Type=Application
-Categories=Application;Game;ArcadeGame;
diff --git a/src/ultrastardx.rc b/src/ultrastardx.rc
index 07061d4d..a8c1aabd 100644
--- a/src/ultrastardx.rc
+++ b/src/ultrastardx.rc
@@ -1,38 +1,38 @@
-Font      		TEX "../Resources/Fonts/Normal/eurostar_regular.png"
-Font      		FNT "../Resources/Fonts/Normal/eurostar_regular.dat"
+Font      		TEX "../game/resources/fonts/Normal/eurostar_regular.png"
+Font      		FNT "../game/resources/fonts/Normal/eurostar_regular.dat"
 
-FontB     		TEX "../Resources/Fonts/Bold/eurostar_regular_bold.png"
-FontB     		FNT "../Resources/Fonts/Bold/eurostar_regular_bold.dat"
+FontB     		TEX "../game/resources/fonts/Bold/eurostar_regular_bold.png"
+FontB     		FNT "../game/resources/fonts/Bold/eurostar_regular_bold.dat"
 
-FontO     		TEX "../Resources/Fonts/Outline 1/Outline 1.png"
-FontO     		FNT "../Resources/Fonts/Outline 1/Outline 1.dat"
+FontO     		TEX "../game/resources/fonts/Outline 1/Outline 1.png"
+FontO     		FNT "../game/resources/fonts/Outline 1/Outline 1.dat"
 
-FontO2    		TEX "../Resources/Fonts/Outline 2/Outline 2.png"
-FontO2    		FNT "../Resources/Fonts/Outline 2/Outline 2.dat"
+FontO2    		TEX "../game/resources/fonts/Outline 2/Outline 2.png"
+FontO2    		FNT "../game/resources/fonts/Outline 2/Outline 2.dat"
 
-MAINICON  		ICON "../Resources/Graphics/ustar-icon_v01.ico"
-WINDOWICON  		TEX  "../Resources/Graphics/ustar-icon.png"
+MAINICON  		ICON "../icons/ultrastardx.ico"
+WINDOWICON  		TEX  "../game/resources/icons/ultrastardx-icon.png"
 
-CRDTS_BG		TEX "../Resources/Graphics/credits_v5_bg.png"
-CRDTS_OVL		TEX "../Resources/Graphics/credits_v5_overlay.png"
-CRDTS_blindguard	TEX "../Resources/Graphics/names_blindguard.png"
-CRDTS_blindy		TEX "../Resources/Graphics/names_blindy.png"
-CRDTS_canni		TEX "../Resources/Graphics/names_canni.png"
-CRDTS_commandio		TEX "../Resources/Graphics/names_commandio.png"
-CRDTS_lazyjoker		TEX "../Resources/Graphics/names_lazyjoker.png"
-CRDTS_mog		TEX "../Resources/Graphics/names_mog.png"
-CRDTS_mota		TEX "../Resources/Graphics/names_mota.png"
-CRDTS_skillmaster	TEX "../Resources/Graphics/names_skillmaster.png"
-CRDTS_whiteshark	TEX "../Resources/Graphics/names_whiteshark.png"
-INTRO_L01		TEX "../Resources/Graphics/intro-l-01.png"
-INTRO_L02		TEX "../Resources/Graphics/intro-l-02.png"
-INTRO_L03		TEX "../Resources/Graphics/intro-l-03.png"
-INTRO_L04		TEX "../Resources/Graphics/intro-l-04.png"
-INTRO_L05		TEX "../Resources/Graphics/intro-l-05.png"
-INTRO_L06		TEX "../Resources/Graphics/intro-l-06.png"
-INTRO_L07		TEX "../Resources/Graphics/intro-l-07.png"
-INTRO_L08		TEX "../Resources/Graphics/intro-l-08.png"
-INTRO_L09		TEX "../Resources/Graphics/intro-l-09.png"
-OUTRO_BG		TEX "../Resources/Graphics/outro-bg.png"
-OUTRO_ESC		TEX "../Resources/Graphics/outro-esc.png"
-OUTRO_EXD		TEX "../Resources/Graphics/outro-exit-dark.png"
+CRDTS_BG		TEX "../game/resources/credits/credits_v5_bg.png"
+CRDTS_OVL		TEX "../game/resources/credits/credits_v5_overlay.png"
+CRDTS_blindguard	TEX "../game/resources/credits/names_blindguard.png"
+CRDTS_blindy		TEX "../game/resources/credits/names_blindy.png"
+CRDTS_canni		TEX "../game/resources/credits/names_canni.png"
+CRDTS_commandio		TEX "../game/resources/credits/names_commandio.png"
+CRDTS_lazyjoker		TEX "../game/resources/credits/names_lazyjoker.png"
+CRDTS_mog		TEX "../game/resources/credits/names_mog.png"
+CRDTS_mota		TEX "../game/resources/credits/names_mota.png"
+CRDTS_skillmaster	TEX "../game/resources/credits/names_skillmaster.png"
+CRDTS_whiteshark	TEX "../game/resources/credits/names_whiteshark.png"
+INTRO_L01		TEX "../game/resources/credits/intro-l-01.png"
+INTRO_L02		TEX "../game/resources/credits/intro-l-02.png"
+INTRO_L03		TEX "../game/resources/credits/intro-l-03.png"
+INTRO_L04		TEX "../game/resources/credits/intro-l-04.png"
+INTRO_L05		TEX "../game/resources/credits/intro-l-05.png"
+INTRO_L06		TEX "../game/resources/credits/intro-l-06.png"
+INTRO_L07		TEX "../game/resources/credits/intro-l-07.png"
+INTRO_L08		TEX "../game/resources/credits/intro-l-08.png"
+INTRO_L09		TEX "../game/resources/credits/intro-l-09.png"
+OUTRO_BG		TEX "../game/resources/credits/outro-bg.png"
+OUTRO_ESC		TEX "../game/resources/credits/outro-esc.png"
+OUTRO_EXD		TEX "../game/resources/credits/outro-exit-dark.png"