diff options
| author | Andrew Niefer | 2007-01-19 21:40:29 +0000 |
|---|---|---|
| committer | Andrew Niefer | 2007-01-19 21:40:29 +0000 |
| commit | f1e21aab613e9ae8b95d8f555b95968fca0ba4be (patch) | |
| tree | 84ba044cede2d2291ab7023408f5cb5ac2b3ecae /bundles/org.eclipse.equinox.executable/library/carbon | |
| parent | a9daa49e3a6e27a89940cb7c38264e234cc3b7c9 (diff) | |
| download | rt.equinox.framework-f1e21aab613e9ae8b95d8f555b95968fca0ba4be.tar.gz rt.equinox.framework-f1e21aab613e9ae8b95d8f555b95968fca0ba4be.tar.xz rt.equinox.framework-f1e21aab613e9ae8b95d8f555b95968fca0ba4be.zip | |
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/carbon')
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c | 6 | ||||
| -rw-r--r-- | bundles/org.eclipse.equinox.executable/library/carbon/make_macosx.mak | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c index 6679b47e9..46f2c5bfd 100644 --- a/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c +++ b/bundles/org.eclipse.equinox.executable/library/carbon/eclipseCarbon.c @@ -196,3 +196,9 @@ void restartLauncher( char* program, char* args[] ) _exit(errno); } } + +int launchJavaVM( _TCHAR* args[] ) +{ + /*for now always do JNI on Mac, should not come in here */ + return -1; +}
\ No newline at end of file diff --git a/bundles/org.eclipse.equinox.executable/library/carbon/make_macosx.mak b/bundles/org.eclipse.equinox.executable/library/carbon/make_macosx.mak index 72bf11b89..b7f5fdd8d 100644 --- a/bundles/org.eclipse.equinox.executable/library/carbon/make_macosx.mak +++ b/bundles/org.eclipse.equinox.executable/library/carbon/make_macosx.mak @@ -27,7 +27,7 @@ PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so # Define the object modules to be compiled and flags. MAIN_OBJS = eclipseMain.o eclipseCarbonMain.o COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseCarbonCommon.o -DLL_OBJS = eclipse.o eclipseCarbon.o eclipseUtil.o eclipseJNI.o +DLL_OBJS = eclipse.o eclipseCarbon.o eclipseUtil.o eclipseJNI.o eclipseShm.o EXEC = $(PROGRAM_OUTPUT) DLL = $(PROGRAM_LIBRARY) @@ -65,6 +65,9 @@ eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h eclipseCommon.o: ../eclipseCommon.h ../eclipseUnicode.h ../eclipseCommon.c $(CC) $(CFLAGS) -c ../eclipseCommon.c -o $@ +eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c + $(CC) $(CFLAGS) -c ../eclipseShm.c -o $@ + $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(CC) -o $(EXEC) $(ARCHS) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS) |