From a20da2af9ffbcbd892fea5652c7c80706692caca Mon Sep 17 00:00:00 2001 From: "shaver%mozilla.org" Date: Tue, 7 Nov 2006 22:58:36 +0000 Subject: [PATCH] Fixing shell XCode project (bug 359850), r=stejohns. --- js/tamarin/extensions/JavaGlue.cpp | 3 + js/tamarin/extensions/JavaGlue.h | 4 + .../mac/shell/shell.xcodeproj/project.pbxproj | 110 +----------------- js/tamarin/shell/avmshell.cpp | 8 +- 4 files changed, 20 insertions(+), 105 deletions(-) diff --git a/js/tamarin/extensions/JavaGlue.cpp b/js/tamarin/extensions/JavaGlue.cpp index c550495729fc..a1459b811ad3 100644 --- a/js/tamarin/extensions/JavaGlue.cpp +++ b/js/tamarin/extensions/JavaGlue.cpp @@ -29,6 +29,7 @@ * ***** END LICENSE BLOCK ***** */ +#ifdef AVMPLUS_WITH_JNI // @todo // local ref and global refs not used at all! @@ -1683,3 +1684,5 @@ namespace avmplus return JNI_OK; } } + +#endif /* AVMPLUS_WITH_JNI */ diff --git a/js/tamarin/extensions/JavaGlue.h b/js/tamarin/extensions/JavaGlue.h index 9dc277b33bb3..084e2b963655 100644 --- a/js/tamarin/extensions/JavaGlue.h +++ b/js/tamarin/extensions/JavaGlue.h @@ -33,6 +33,8 @@ #ifndef _JAVA_GLUE_H_ #define _JAVA_GLUE_H_ +#ifdef AVMPLUS_WITH_JNI + #define NO_JNI_STDIO #include @@ -280,4 +282,6 @@ namespace avmplus }; } +#endif /* AVMPLUS_WITH_JNI */ + #endif /* _JAVA_GLUE_H_ */ diff --git a/js/tamarin/platform/mac/shell/shell.xcodeproj/project.pbxproj b/js/tamarin/platform/mac/shell/shell.xcodeproj/project.pbxproj index 6b0bf054f2fd..1c6d4b00fa16 100644 --- a/js/tamarin/platform/mac/shell/shell.xcodeproj/project.pbxproj +++ b/js/tamarin/platform/mac/shell/shell.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 1A91570F0B012A3F00744986 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A91570E0B012A3F00744986 /* libz.dylib */; }; 6803D2C90A5064FD00C797BB /* JavaGlue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6803D2C70A5064FD00C797BB /* JavaGlue.cpp */; }; 6803D2CA0A5064FD00C797BB /* JavaGlue.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6803D2C80A5064FD00C797BB /* JavaGlue.h */; }; 8E8B529E09AABAA30057BEE4 /* avmshell.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8E8B527909AABAA20057BEE4 /* avmshell.cpp */; }; @@ -51,28 +52,6 @@ 8EDDB9E909AAD1D300FB9EE5 /* DictionaryGlue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDB9E609AAD1D300FB9EE5 /* DictionaryGlue.cpp */; }; 8EDDB9EA09AAD1D300FB9EE5 /* DictionaryGlue.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDB9E709AAD1D300FB9EE5 /* DictionaryGlue.h */; }; 8EDDB9F409AAD2B700FB9EE5 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8EDDB9F309AAD2B700FB9EE5 /* CoreServices.framework */; }; - 8EDDBA3B09AADB9500FB9EE5 /* adler32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA2509AADB9500FB9EE5 /* adler32.cpp */; }; - 8EDDBA3C09AADB9500FB9EE5 /* compress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA2609AADB9500FB9EE5 /* compress.cpp */; }; - 8EDDBA3D09AADB9500FB9EE5 /* crc32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA2709AADB9500FB9EE5 /* crc32.cpp */; }; - 8EDDBA3E09AADB9500FB9EE5 /* crc32.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA2809AADB9500FB9EE5 /* crc32.h */; }; - 8EDDBA3F09AADB9500FB9EE5 /* deflate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA2909AADB9500FB9EE5 /* deflate.cpp */; }; - 8EDDBA4009AADB9500FB9EE5 /* deflate.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA2A09AADB9500FB9EE5 /* deflate.h */; }; - 8EDDBA4109AADB9500FB9EE5 /* infback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA2B09AADB9500FB9EE5 /* infback.cpp */; }; - 8EDDBA4209AADB9500FB9EE5 /* inffast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA2C09AADB9500FB9EE5 /* inffast.cpp */; }; - 8EDDBA4309AADB9500FB9EE5 /* inffast.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA2D09AADB9500FB9EE5 /* inffast.h */; }; - 8EDDBA4409AADB9500FB9EE5 /* inffixed.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA2E09AADB9500FB9EE5 /* inffixed.h */; }; - 8EDDBA4509AADB9500FB9EE5 /* inflate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA2F09AADB9500FB9EE5 /* inflate.cpp */; }; - 8EDDBA4609AADB9500FB9EE5 /* inflate.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA3009AADB9500FB9EE5 /* inflate.h */; }; - 8EDDBA4709AADB9500FB9EE5 /* inftrees.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA3109AADB9500FB9EE5 /* inftrees.cpp */; }; - 8EDDBA4809AADB9500FB9EE5 /* inftrees.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA3209AADB9500FB9EE5 /* inftrees.h */; }; - 8EDDBA4909AADB9500FB9EE5 /* stdafx.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA3309AADB9500FB9EE5 /* stdafx.h */; }; - 8EDDBA4A09AADB9500FB9EE5 /* trees.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA3409AADB9500FB9EE5 /* trees.cpp */; }; - 8EDDBA4B09AADB9500FB9EE5 /* trees.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA3509AADB9500FB9EE5 /* trees.h */; }; - 8EDDBA4C09AADB9500FB9EE5 /* uncompr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA3609AADB9500FB9EE5 /* uncompr.cpp */; }; - 8EDDBA4D09AADB9500FB9EE5 /* zconf.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA3709AADB9500FB9EE5 /* zconf.h */; }; - 8EDDBA4E09AADB9500FB9EE5 /* zlib.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA3809AADB9500FB9EE5 /* zlib.h */; }; - 8EDDBA4F09AADB9500FB9EE5 /* zutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8EDDBA3909AADB9500FB9EE5 /* zutil.cpp */; }; - 8EDDBA5009AADB9500FB9EE5 /* zutil.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8EDDBA3A09AADB9500FB9EE5 /* zutil.h */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -140,17 +119,6 @@ 8E8B52C209AABAA30057BEE4 /* UShortArray.as in CopyFiles */, 8EDDB9E809AAD1D300FB9EE5 /* Dictionary.as in CopyFiles */, 8EDDB9EA09AAD1D300FB9EE5 /* DictionaryGlue.h in CopyFiles */, - 8EDDBA3E09AADB9500FB9EE5 /* crc32.h in CopyFiles */, - 8EDDBA4009AADB9500FB9EE5 /* deflate.h in CopyFiles */, - 8EDDBA4309AADB9500FB9EE5 /* inffast.h in CopyFiles */, - 8EDDBA4409AADB9500FB9EE5 /* inffixed.h in CopyFiles */, - 8EDDBA4609AADB9500FB9EE5 /* inflate.h in CopyFiles */, - 8EDDBA4809AADB9500FB9EE5 /* inftrees.h in CopyFiles */, - 8EDDBA4909AADB9500FB9EE5 /* stdafx.h in CopyFiles */, - 8EDDBA4B09AADB9500FB9EE5 /* trees.h in CopyFiles */, - 8EDDBA4D09AADB9500FB9EE5 /* zconf.h in CopyFiles */, - 8EDDBA4E09AADB9500FB9EE5 /* zlib.h in CopyFiles */, - 8EDDBA5009AADB9500FB9EE5 /* zutil.h in CopyFiles */, 6803D2CA0A5064FD00C797BB /* JavaGlue.h in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 1; @@ -158,6 +126,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 1A91570E0B012A3F00744986 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = ""; }; 6803D2C70A5064FD00C797BB /* JavaGlue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = JavaGlue.cpp; path = ../../../extensions/JavaGlue.cpp; sourceTree = SOURCE_ROOT; }; 6803D2C80A5064FD00C797BB /* JavaGlue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JavaGlue.h; path = ../../../extensions/JavaGlue.h; sourceTree = SOURCE_ROOT; }; 8DD76FB20486AB0100D96B5E /* shell */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = shell; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -203,28 +172,6 @@ 8EDDB9E609AAD1D300FB9EE5 /* DictionaryGlue.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DictionaryGlue.cpp; path = ../../../extensions/DictionaryGlue.cpp; sourceTree = SOURCE_ROOT; }; 8EDDB9E709AAD1D300FB9EE5 /* DictionaryGlue.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DictionaryGlue.h; path = ../../../extensions/DictionaryGlue.h; sourceTree = SOURCE_ROOT; }; 8EDDB9F309AAD2B700FB9EE5 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = ""; }; - 8EDDBA2509AADB9500FB9EE5 /* adler32.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = adler32.cpp; path = ../../../../zlib/adler32.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA2609AADB9500FB9EE5 /* compress.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = compress.cpp; path = ../../../../zlib/compress.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA2709AADB9500FB9EE5 /* crc32.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = crc32.cpp; path = ../../../../zlib/crc32.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA2809AADB9500FB9EE5 /* crc32.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = crc32.h; path = ../../../../zlib/crc32.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA2909AADB9500FB9EE5 /* deflate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = deflate.cpp; path = ../../../../zlib/deflate.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA2A09AADB9500FB9EE5 /* deflate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = deflate.h; path = ../../../../zlib/deflate.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA2B09AADB9500FB9EE5 /* infback.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = infback.cpp; path = ../../../../zlib/infback.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA2C09AADB9500FB9EE5 /* inffast.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = inffast.cpp; path = ../../../../zlib/inffast.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA2D09AADB9500FB9EE5 /* inffast.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = inffast.h; path = ../../../../zlib/inffast.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA2E09AADB9500FB9EE5 /* inffixed.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = inffixed.h; path = ../../../../zlib/inffixed.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA2F09AADB9500FB9EE5 /* inflate.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = inflate.cpp; path = ../../../../zlib/inflate.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA3009AADB9500FB9EE5 /* inflate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = inflate.h; path = ../../../../zlib/inflate.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA3109AADB9500FB9EE5 /* inftrees.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = inftrees.cpp; path = ../../../../zlib/inftrees.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA3209AADB9500FB9EE5 /* inftrees.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = inftrees.h; path = ../../../../zlib/inftrees.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA3309AADB9500FB9EE5 /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = stdafx.h; path = ../../../../zlib/stdafx.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA3409AADB9500FB9EE5 /* trees.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = trees.cpp; path = ../../../../zlib/trees.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA3509AADB9500FB9EE5 /* trees.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = trees.h; path = ../../../../zlib/trees.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA3609AADB9500FB9EE5 /* uncompr.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = uncompr.cpp; path = ../../../../zlib/uncompr.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA3709AADB9500FB9EE5 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = zconf.h; path = ../../../../zlib/zconf.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA3809AADB9500FB9EE5 /* zlib.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = zlib.h; path = ../../../../zlib/zlib.h; sourceTree = SOURCE_ROOT; }; - 8EDDBA3909AADB9500FB9EE5 /* zutil.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = zutil.cpp; path = ../../../../zlib/zutil.cpp; sourceTree = SOURCE_ROOT; }; - 8EDDBA3A09AADB9500FB9EE5 /* zutil.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = zutil.h; path = ../../../../zlib/zutil.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -235,6 +182,7 @@ 8EDDB9DF09AAD18200FB9EE5 /* libMMgc.a in Frameworks */, 8EDDB9DE09AAD17F00FB9EE5 /* libavmplus.a in Frameworks */, 8EDDB9F409AAD2B700FB9EE5 /* CoreServices.framework in Frameworks */, + 1A91570F0B012A3F00744986 /* libz.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -255,7 +203,6 @@ 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 8EDDBA2409AADB7B00FB9EE5 /* zlib */, 8EDDB9E409AAD1BF00FB9EE5 /* extensions */, 8EDDB9E209AAD1A100FB9EE5 /* shell */, ); @@ -281,6 +228,7 @@ 8E8B52C909AABAC80057BEE4 /* Libraries */ = { isa = PBXGroup; children = ( + 1A91570E0B012A3F00744986 /* libz.dylib */, 8EDDB9F309AAD2B700FB9EE5 /* CoreServices.framework */, 8E8B52CD09AABB120057BEE4 /* MMgc.xcodeproj */, 8E8B52C309AABABE0057BEE4 /* avmplus.xcodeproj */, @@ -351,35 +299,6 @@ name = extensions; sourceTree = ""; }; - 8EDDBA2409AADB7B00FB9EE5 /* zlib */ = { - isa = PBXGroup; - children = ( - 8EDDBA2509AADB9500FB9EE5 /* adler32.cpp */, - 8EDDBA2609AADB9500FB9EE5 /* compress.cpp */, - 8EDDBA2709AADB9500FB9EE5 /* crc32.cpp */, - 8EDDBA2809AADB9500FB9EE5 /* crc32.h */, - 8EDDBA2909AADB9500FB9EE5 /* deflate.cpp */, - 8EDDBA2A09AADB9500FB9EE5 /* deflate.h */, - 8EDDBA2B09AADB9500FB9EE5 /* infback.cpp */, - 8EDDBA2C09AADB9500FB9EE5 /* inffast.cpp */, - 8EDDBA2D09AADB9500FB9EE5 /* inffast.h */, - 8EDDBA2E09AADB9500FB9EE5 /* inffixed.h */, - 8EDDBA2F09AADB9500FB9EE5 /* inflate.cpp */, - 8EDDBA3009AADB9500FB9EE5 /* inflate.h */, - 8EDDBA3109AADB9500FB9EE5 /* inftrees.cpp */, - 8EDDBA3209AADB9500FB9EE5 /* inftrees.h */, - 8EDDBA3309AADB9500FB9EE5 /* stdafx.h */, - 8EDDBA3409AADB9500FB9EE5 /* trees.cpp */, - 8EDDBA3509AADB9500FB9EE5 /* trees.h */, - 8EDDBA3609AADB9500FB9EE5 /* uncompr.cpp */, - 8EDDBA3709AADB9500FB9EE5 /* zconf.h */, - 8EDDBA3809AADB9500FB9EE5 /* zlib.h */, - 8EDDBA3909AADB9500FB9EE5 /* zutil.cpp */, - 8EDDBA3A09AADB9500FB9EE5 /* zutil.h */, - ); - name = zlib; - sourceTree = ""; - }; C6A0FF2B0290797F04C91782 /* Documentation */ = { isa = PBXGroup; children = ( @@ -469,17 +388,6 @@ 8E8B52BA09AABAA30057BEE4 /* SystemClass.cpp in Sources */, 8E8B52BF09AABAA30057BEE4 /* TypedArrayClass.cpp in Sources */, 8EDDB9E909AAD1D300FB9EE5 /* DictionaryGlue.cpp in Sources */, - 8EDDBA3B09AADB9500FB9EE5 /* adler32.cpp in Sources */, - 8EDDBA3C09AADB9500FB9EE5 /* compress.cpp in Sources */, - 8EDDBA3D09AADB9500FB9EE5 /* crc32.cpp in Sources */, - 8EDDBA3F09AADB9500FB9EE5 /* deflate.cpp in Sources */, - 8EDDBA4109AADB9500FB9EE5 /* infback.cpp in Sources */, - 8EDDBA4209AADB9500FB9EE5 /* inffast.cpp in Sources */, - 8EDDBA4509AADB9500FB9EE5 /* inflate.cpp in Sources */, - 8EDDBA4709AADB9500FB9EE5 /* inftrees.cpp in Sources */, - 8EDDBA4A09AADB9500FB9EE5 /* trees.cpp in Sources */, - 8EDDBA4C09AADB9500FB9EE5 /* uncompr.cpp in Sources */, - 8EDDBA4F09AADB9500FB9EE5 /* zutil.cpp in Sources */, 6803D2C90A5064FD00C797BB /* JavaGlue.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -517,10 +425,7 @@ 1DEB928708733DD80010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = i386; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; INSTALL_PATH = "$(HOME)/bin"; @@ -595,10 +500,7 @@ 8E8B52FF09AABD020057BEE4 /* Release Debugger */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); + ARCHS = i386; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = G5; INSTALL_PATH = "$(HOME)/bin"; diff --git a/js/tamarin/shell/avmshell.cpp b/js/tamarin/shell/avmshell.cpp index a6379e8cb317..ba016864c97c 100644 --- a/js/tamarin/shell/avmshell.cpp +++ b/js/tamarin/shell/avmshell.cpp @@ -94,7 +94,9 @@ namespace avmshell NATIVE_CLASS(abcclass_avmplus_File, FileClass, ScriptObject) NATIVE_CLASS(abcclass_avmplus_Domain, DomainClass, DomainObject) NATIVE_CLASS(abcclass_avmplus_StringBuilder, StringBuilderClass, StringBuilderObject) +#ifdef AVMPLUS_WITH_JNI NATIVE_CLASS(abcclass_avmplus_JObject, JObjectClass, JObject) +#endif /* AVMPLUS_WITH_JNI */ NATIVE_CLASS(abcclass_flash_utils_ByteArray, ByteArrayClass, ByteArrayObject) NATIVE_CLASS(abcclass_flash_utils_ShortArray, ShortArrayClass, ShortArrayObject) NATIVE_CLASS(abcclass_flash_utils_UShortArray, UShortArrayClass, UShortArrayObject) @@ -568,6 +570,7 @@ namespace avmshell SetErrorMode(0); // set to default #endif // WIN32 } +#ifdef AVMPLUS_WITH_JNI else if (!strcmp(arg, "-jargs")) { // all the following args until the semi colon is for java. //@todo fix up this hard limit @@ -585,7 +588,8 @@ namespace avmshell } AvmAssert(strlen(Java::startup_options) < 256); } - +#endif /* AVMPLUS_WITH_JNI */ + #ifdef DEBUGGER else if (!strcmp(arg, "-d")) { do_debugger = true; @@ -975,7 +979,9 @@ namespace avmshell #ifdef AVMPLUS_PROFILE dump(); #endif +#ifdef AVMPLUS_WITH_JNI if (Java::startup_options) delete Java::startup_options; +#endif /* AVMPLUS_WITH_JNI */ return 0; }