ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/utilvago.cpp

Comparing Vago/trunk/Vago/utilvago.cpp (file contents):
Revision 1047 by s10k, Fri Sep 16 22:51:26 2016 UTC vs.
Revision 1052 by s10k, Sat Sep 17 13:32:34 2016 UTC

#	Line 66 | Line 66 | QString getAppPath(){
66		return getOSIndependentAppPath();
67		}
68
69	<	QString getOniSplitExeAbsolutePath(){
69	>	// Absolute paths
70	>	QString getOniSplitExecutableAbsolutePath(){
71	>	return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString;
72	>	}
73	>
74	>	QString getXmlToolsExecutableAbsolutePath(){
75	>	return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString;
76	>	}
77	>
78	>	// Executables (includes mono if necessary)
79	>	QString getOniSplitExecutable(){
80
81		#ifdef Q_OS_MAC
82	<	return getMonoExecutablePath() + " " + getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString;
82	>	return getMonoExecutablePath() + " " + getOniSplitExecutableAbsolutePath();
83		#else
84	<	return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString;
84	>	return getOniSplitExecutableAbsolutePath();
85		#endif
86		}
87
88	<	QString getXmlToolsExeAbsolutePath(){
89	<	return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString;
88	>	QString getXmlToolsExecutable(){
89	>	return getXmlToolsExecutableAbsolutePath();
90		}
91
92		#ifdef Q_OS_MAC

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)