5 files changed, 22 insertions, 8 deletions
diff --git a/Hosted Mode Browser Linux.launch b/Hosted Mode Browser Linux.launch
index 085a3a2dde..2be0cc924b 100644
--- a/Hosted Mode Browser Linux.launch
+++ b/Hosted Mode Browser Linux.launch
@@ -8,8 +8,8 @@
 </listAttribute>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;GwtClient&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-linux-1.4.59/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-linux-1.4.59/gwt-dev-linux.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-dev-linux.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.01  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
diff --git a/Hosted Mode Browser Mac.launch b/Hosted Mode Browser Mac.launch
index adbefe0c32..71946f5405 100644
--- a/Hosted Mode Browser Mac.launch
+++ b/Hosted Mode Browser Mac.launch
@@ -8,8 +8,8 @@
 </listAttribute>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;GwtClient&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-mac-1.4.59/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt-mac-1.4.59/gwt-dev-mac.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/build/gwt/gwt/gwt-dev-mac.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/tk-trunk/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-noserver -whitelist &quot;127.0.0.1  ^http[:][/][/]127[.]0[.]0[.]1[:]8080&quot; -logLevel ALL -out WebContents/gwt -style PRETTY  http://127.0.0.1:8080/tk/com.itmill.toolkit.terminal.gwt.Client/gwt-test.html"/>
diff --git a/Hosted Mode Browser Win.launch b/Hosted Mode Browser Win.launch
index b7d9546a03..dccf86cd0d 100644
--- a/Hosted Mode Browser Win.launch
+++ b/Hosted Mode Browser Win.launch
@@ -8,8 +8,8 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;itmill-toolkit&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;itmill-toolkit&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt-windows-1.4.59/gwt-dev-windows.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt-windows-1.4.59/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt/gwt-dev-windows.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/itmill-toolkit/build/gwt/gwt/gwt-user.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="itmill-toolkit"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
diff --git a/build/bin/compile-gwt-components b/build/bin/compile-gwt-components
index 3456872d0d..3f02e92315 100755
--- a/build/bin/compile-gwt-components
+++ b/build/bin/compile-gwt-components
@@ -1,3 +1,17 @@
 #!/bin/sh
+
+JVMVARS=""
+
+PLATFORM=""
+
+if [ -d "/Users" ]
+then
+    echo "MAC OS"
+    JVMVARS="$JVMVARS -XstartOnFirstThread"
+    PLATFORM="mac"
+else
+	PLATFORM="linux"
+fi
+
 rm -r ../../WebContent/com.itmill.toolkit.terminal.gwt.Client/*
-java -XstartOnFirstThread -cp "../../src:../gwt/gwt-mac-1.4.59/gwt-user.jar:../gwt/gwt-mac-1.4.59/gwt-dev-mac.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent" "$@" com.itmill.toolkit.terminal.gwt.Client;
+java $JVMVARS -cp "../../src:../gwt/gwt/gwt-user.jar:../gwt/gwt/gwt-dev-$PLATFORM.jar" com.google.gwt.dev.GWTCompiler -out "../../WebContent" "$@" com.itmill.toolkit.terminal.gwt.Client;
diff --git a/build/bin/compile-gwt-components.bat b/build/bin/compile-gwt-components.bat
index f1325b81e3..25bdfd9ebc 100644
--- a/build/bin/compile-gwt-components.bat
+++ b/build/bin/compile-gwt-components.bat
@@ -1 +1 @@
-@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt-windows-1.4.59/gwt-user.jar;%~dp0\../gwt/gwt-windows-1.4.59/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent" %* com.itmill.toolkit.terminal.gwt.Client
-\ No newline at end of file
+@java -cp "%~dp0\../../src;%~dp0\bin;%~dp0\../gwt/gwt/gwt-user.jar;%~dp0\../gwt/gwt/gwt-dev-windows.jar" com.google.gwt.dev.GWTCompiler -out "%~dp0\../../WebContent" %* com.itmill.toolkit.terminal.gwt.Client
+\ No newline at end of file