From: jsimomaa <jsimomaa@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 16 Oct 2014 07:18:11 +0000 (+0000)
Subject: Merged trunk@30158, @30159, @30162, @30202, @30417 to branches/sysdyn-1.8 on 2014... 
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=b1a22a8c6771f8c55c14b22f6456ced956f2f2b6;p=simantics%2Fsysdyn.git

Merged trunk@30158, @30159, @30162, @30202, @30417 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release.

refs #5244

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30419 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

diff --git a/org.simantics.fmu.me.win64/.classpath b/org.simantics.fmu.me.win64/.classpath
new file mode 100644
index 00000000..8a8f1668
--- /dev/null
+++ b/org.simantics.fmu.me.win64/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.simantics.fmu.me.win64/.project b/org.simantics.fmu.me.win64/.project
new file mode 100644
index 00000000..738e38b0
--- /dev/null
+++ b/org.simantics.fmu.me.win64/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.simantics.fmu.me.win64</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs b/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..f287d53c
--- /dev/null
+++ b/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF b/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..ea48c6f7
--- /dev/null
+++ b/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Win64 binaries for FMI model exchange
+Bundle-SymbolicName: org.simantics.fmu.me.win64
+Bundle-Version: 1.1.0.qualifier
+Bundle-Vendor: Semantum Oy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.simantics.utils;bundle-version="1.1.0"
+Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))
diff --git a/org.simantics.fmu.me.win64/build.properties b/org.simantics.fmu.me.win64/build.properties
new file mode 100644
index 00000000..150031be
--- /dev/null
+++ b/org.simantics.fmu.me.win64/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               libraries/
diff --git a/org.simantics.fmu.me.win64/libraries/FMUSimulator.dll b/org.simantics.fmu.me.win64/libraries/FMUSimulator.dll
new file mode 100644
index 00000000..4e7cdc76
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/FMUSimulator.dll differ
diff --git a/org.simantics.fmu.me.win64/libraries/libexpat.dll b/org.simantics.fmu.me.win64/libraries/libexpat.dll
new file mode 100644
index 00000000..0f8b01be
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/libexpat.dll differ
diff --git a/org.simantics.fmu.me.win64/libraries/miniunz.dll b/org.simantics.fmu.me.win64/libraries/miniunz.dll
new file mode 100644
index 00000000..4ad78ba2
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/miniunz.dll differ
diff --git a/org.simantics.fmu.me.win64/libraries/zlibwapi.dll b/org.simantics.fmu.me.win64/libraries/zlibwapi.dll
new file mode 100644
index 00000000..72f5e384
Binary files /dev/null and b/org.simantics.fmu.me.win64/libraries/zlibwapi.dll differ