diff options
| author | Andrew Niefer | 2010-08-12 20:50:40 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2010-08-12 20:50:40 +0000 |
| commit | 0d542b29c339542d8b1c15b10377274fc7cb64a1 (patch) | |
| tree | 564d8f000df659437f3ab32e5b861590db3f95d6 /bundles | |
| parent | 67a27df7f4e3927c6360476f790ac72360d9457a (diff) | |
| download | rt.equinox.framework-0d542b29c339542d8b1c15b10377274fc7cb64a1.tar.gz rt.equinox.framework-0d542b29c339542d8b1c15b10377274fc7cb64a1.tar.xz rt.equinox.framework-0d542b29c339542d8b1c15b10377274fc7cb64a1.zip | |
project config
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/.cproject | 19 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/.project | 8 |
2 files changed, 14 insertions, 13 deletions
diff --git a/bundles/org.eclipse.equinox.executable/.cproject b/bundles/org.eclipse.equinox.executable/.cproject index 214395ba0..78f3fe986 100644 --- a/bundles/org.eclipse.equinox.executable/.cproject +++ b/bundles/org.eclipse.equinox.executable/.cproject @@ -55,15 +55,6 @@ <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/> <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/> <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/> - <storageModule moduleId="org.eclipse.cdt.core.pathentry"> - <pathentry kind="mac" name="JNIEXPORT" path="" value=""/> - <pathentry include="/usr/X11R6/include" kind="inc" path="" system="true"/> - <pathentry include="/opt/gnome/include/gtk-2.0" kind="inc" path="" system="true"/> - <pathentry include="/opt/gnome/include/glib-2.0" kind="inc" path="" system="true"/> - <pathentry kind="src" path=""/> - <pathentry kind="out" path=""/> - <pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> - </storageModule> <storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"> <buildTargets> <target name="linux-all" path="library/gtk" targetID="org.eclipse.cdt.make.MakeTargetBuilder"> @@ -132,6 +123,16 @@ </target> </buildTargets> </storageModule> + <storageModule moduleId="org.eclipse.cdt.core.pathentry"> + <pathentry kind="mac" name="JNIEXPORT" path="" value=""/> + <pathentry kind="mac" name="JNICALL" path="" value=""/> + <pathentry include="/usr/X11R6/include" kind="inc" path="" system="true"/> + <pathentry include="/opt/gnome/include/gtk-2.0" kind="inc" path="" system="true"/> + <pathentry include="/opt/gnome/include/glib-2.0" kind="inc" path="" system="true"/> + <pathentry kind="src" path=""/> + <pathentry kind="out" path=""/> + <pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/> + </storageModule> </cconfiguration> </storageModule> </cproject>
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.executable/.project b/bundles/org.eclipse.equinox.executable/.project index e9419d7aa..f68290670 100644 --- a/bundles/org.eclipse.equinox.executable/.project +++ b/bundles/org.eclipse.equinox.executable/.project @@ -19,7 +19,7 @@ </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.build.arguments</key> - <value></value> + <value>-f make_${system:OS}.mak</value> </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.build.command</key> @@ -27,7 +27,7 @@ </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.build.location</key> - <value>\org.eclipse.equinox.executable\library\${system_property:osgi.ws}</value> + <value>/org.eclipse.equinox.executable/library/${system_property:osgi.ws}</value> </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.build.target.auto</key> @@ -59,7 +59,7 @@ </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.environment</key> - <value>DEFAULT_WS=${system_property:osgi.ws}|DEFAULT_OS=${system_property:osgi.os}|DEFAULT_OS_ARCH=${system_property:osgi.arch}|X11_HOME=/usr/X11R6|PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig|MOTIF_HOME=/usr/X11|</value> + <value>DEFAULT_OS=${system_property:osgi.os}|DEFAULT_OS_ARCH=${system_property:osgi.arch}|X11_HOME=/usr/X11R6|DEFAULT_WS=${system_property:osgi.ws}|JAVA_HOME=${system_property:java.home}/..|MOTIF_HOME=/usr/X11|PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig:/opt/kde3/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/lib64/pkgconfig:/opt/gnome/share/pkgconfig|</value> </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.stopOnError</key> @@ -67,7 +67,7 @@ </dictionary> <dictionary> <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key> - <value>true</value> + <value>false</value> </dictionary> </arguments> </buildCommand> |