From 8df0b80dbe65b0dc9003d7e89114b4f58c487850 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Thu, 5 Oct 2006 08:21:41 +0000
Subject: [PATCH] fix smpackage compile

---
 stepmania/src/ThemeManager.cpp                |  2 ++
 stepmania/src/smpackage-net2003.vcproj        | 10 ++++++++--
 stepmania/src/smpackage/CreateLanguageDlg.cpp |  1 +
 stepmania/src/smpackage/LanguagesDlg.cpp      |  9 +++++----
 stepmania/src/smpackage/MainMenuDlg.cpp       |  1 +
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index c339b29f8a..b062cce253 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -946,6 +946,7 @@ LuaReference ThemeManager::GetMetricR( const RString &sClassName, const RString
 	return ref;
 }
 
+#if !defined(SMPACKAGE)
 void ThemeManager::PushMetric( Lua *L, const RString &sClassName, const RString &sValueName )
 {
 	RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
@@ -961,6 +962,7 @@ void ThemeManager::PushMetric( Lua *L, const RString &sClassName, const RString
 		LuaHelpers::RunExpression( L, sValue, sName );
 	}
 }
+#endif
 
 void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName, LuaReference &valueOut )
 {
diff --git a/stepmania/src/smpackage-net2003.vcproj b/stepmania/src/smpackage-net2003.vcproj
index 4b60a188b2..fcf4520cba 100644
--- a/stepmania/src/smpackage-net2003.vcproj
+++ b/stepmania/src/smpackage-net2003.vcproj
@@ -247,10 +247,10 @@
 				RelativePath=".\smpackage\resource.h">
 			</File>
 			<File
-				RelativePath="smpackage.ICO">
+				RelativePath="res\smpackage.ico">
 			</File>
 			<File
-				RelativePath="res\smpackage.ico">
+				RelativePath="smpackage.ICO">
 			</File>
 			<File
 				RelativePath=".\smpackage\smpackage.rc">
@@ -306,6 +306,12 @@
 				<File
 					RelativePath=".\archutils\Win32\DialogUtil.h">
 				</File>
+				<File
+					RelativePath=".\archutils\Win32\ErrorStrings.cpp">
+				</File>
+				<File
+					RelativePath=".\archutils\Win32\ErrorStrings.h">
+				</File>
 				<File
 					RelativePath=".\archutils\Win32\GotoURL.cpp">
 				</File>
diff --git a/stepmania/src/smpackage/CreateLanguageDlg.cpp b/stepmania/src/smpackage/CreateLanguageDlg.cpp
index b512b618be..dd03a9a9ef 100644
--- a/stepmania/src/smpackage/CreateLanguageDlg.cpp
+++ b/stepmania/src/smpackage/CreateLanguageDlg.cpp
@@ -10,6 +10,7 @@
 #include "SMPackageUtil.h"
 #include ".\createlanguagedlg.h"
 #include "archutils/Win32/DialogUtil.h"
+#include "archutils/Win32/ErrorStrings.h"
 
 // CreateLanguageDlg dialog
 
diff --git a/stepmania/src/smpackage/LanguagesDlg.cpp b/stepmania/src/smpackage/LanguagesDlg.cpp
index 9b52cccc19..5297a93965 100644
--- a/stepmania/src/smpackage/LanguagesDlg.cpp
+++ b/stepmania/src/smpackage/LanguagesDlg.cpp
@@ -22,6 +22,7 @@
 #include "arch/Dialog/Dialog.h"
 #include "archutils/Win32/SpecialDirs.h"
 #include "archutils/Win32/GotoURL.h"
+#include "archutils/Win32/ErrorStrings.h"
 
 // LanguagesDlg dialog
 
@@ -291,7 +292,7 @@ void LanguagesDlg::OnBnClickedButtonExport()
 			TranslationLine tl;
 			tl.sSection = key->m_sName;
 			tl.sID = value->first;
-			tl.sBaseLanguage = value->second;
+			tl.sBaseLanguage = value->second->GetValue<RString>();
 			ini2.GetValue( tl.sSection, tl.sID, tl.sCurrentLanguage );
 
 			// don't export empty strings
@@ -511,7 +512,7 @@ void LanguagesDlg::OnBnClickedCheckLanguage()
 			{
 				const RString &sSection = key->m_sName;
 				const RString &sID = value->first;
-				const RString &sBaseLanguage = value->second;
+				const RString &sBaseLanguage = value->second->GetValue<RString>();
 				RString sCurrentLanguage;
 				ini2.GetValue( sSection, sID, sCurrentLanguage );
 
@@ -581,7 +582,7 @@ void LanguagesDlg::OnBnClickedCheckLanguage()
 			{
 				const RString &sSection = key->m_sName;
 				const RString &sID = value->first;
-				const RString &sCurrentLanguage = value->second;
+				const RString &sCurrentLanguage = value->second->GetValue<RString>();
 				if( utf8_is_valid(sCurrentLanguage) )
 					continue;
 
@@ -628,7 +629,7 @@ void LanguagesDlg::OnBnClickedCheckLanguage()
 			FOREACH_CONST_Attr( key, value )
 			{
 				const RString &sID = value->first;
-				const RString &sBaseText = value->second;
+				const RString &sBaseText = value->second->GetValue<RString>();
 				if( sBaseText.empty() )
 					continue;
 				RString sCurrentLanguage;
diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp
index 34a99adcd4..e0d8075666 100644
--- a/stepmania/src/smpackage/MainMenuDlg.cpp
+++ b/stepmania/src/smpackage/MainMenuDlg.cpp
@@ -22,6 +22,7 @@
 #include "LocalizedString.h"
 #include "RageFileManager.h"
 #include "arch/Dialog/Dialog.h"
+#include "archutils/Win32/ErrorStrings.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW