Skip to content

Commit 3e5801e

Browse files
Merge pull request cocos2d#5 from dumganhar/spidermonkey-v23-support
Updating spidermonkey library to firefox v23. Former-commit-id: 77396730c2280165f54ef1e78fb4b7aa77828dbb
2 parents 8ca228d + c4a6cf8 commit 3e5801e

File tree

117 files changed

+4799
-1881
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+4799
-1881
lines changed

console/bin/jsbcc.REMOVED.git-id

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
460d6fcc07984b529be9e292d580b898ddc84b86
1+
58c02b0fb249d7fef5e65b682846a96cdbee9f39

console/bin/jsbcc.exe

512 Bytes
Binary file not shown.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
83c05fbd090f7df8dda9789f7201534375ebb993

console/bin/mozjs.dll.REMOVED.git-id

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/jsbcc_source/jsbcc-vc2010.sln renamed to src/jsbcc_source/jsbcc-vc2012.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 11.00
33
# Visual Studio 2010
4-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsbcc", "jsbcc-vc2010.vcxproj", "{BD6738AE-6468-4881-B32B-5749DCF95511}"
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsbcc", "jsbcc-vc2012.vcxproj", "{BD6738AE-6468-4881-B32B-5749DCF95511}"
55
EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/jsbcc_source/jsbcc-vc2010.vcxproj renamed to src/jsbcc_source/jsbcc-vc2012.vcxproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@
2121
<ConfigurationType>Application</ConfigurationType>
2222
<UseDebugLibraries>true</UseDebugLibraries>
2323
<CharacterSet>Unicode</CharacterSet>
24+
<PlatformToolset>v110</PlatformToolset>
2425
</PropertyGroup>
2526
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2627
<ConfigurationType>Application</ConfigurationType>
2728
<UseDebugLibraries>false</UseDebugLibraries>
2829
<WholeProgramOptimization>true</WholeProgramOptimization>
2930
<CharacterSet>Unicode</CharacterSet>
31+
<PlatformToolset>v110</PlatformToolset>
3032
</PropertyGroup>
3133
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3234
<ImportGroup Label="ExtensionSettings">
@@ -57,7 +59,7 @@
5759
<SubSystem>Console</SubSystem>
5860
<GenerateDebugInformation>true</GenerateDebugInformation>
5961
<AdditionalLibraryDirectories>spidermonkey-win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
60-
<AdditionalDependencies>Ws2_32.lib;mozjs.lib</AdditionalDependencies>
62+
<AdditionalDependencies>Ws2_32.lib;mozjs-23.0.lib</AdditionalDependencies>
6163
</Link>
6264
<PostBuildEvent>
6365
<Command>
@@ -81,7 +83,7 @@
8183
<EnableCOMDATFolding>true</EnableCOMDATFolding>
8284
<OptimizeReferences>true</OptimizeReferences>
8385
<AdditionalLibraryDirectories>spidermonkey-win32\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
84-
<AdditionalDependencies>Ws2_32.lib;mozjs.lib</AdditionalDependencies>
86+
<AdditionalDependencies>Ws2_32.lib;mozjs-23.0.lib</AdditionalDependencies>
8587
</Link>
8688
<PostBuildEvent>
8789
<Command>

src/jsbcc_source/jsbcc.xcodeproj/project.pbxproj

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
/* End PBXBuildFile section */
1313

1414
/* Begin PBXFileReference section */
15-
1ABA2824174CC9FD007A6C10 /* BitArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BitArray.h; sourceTree = "<group>"; };
16-
1ABA2826174CC9FD007A6C10 /* Root.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Root.h; sourceTree = "<group>"; };
1715
1ABA2828174CC9FD007A6C10 /* Anchor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Anchor.h; sourceTree = "<group>"; };
1816
1ABA2829174CC9FD007A6C10 /* CharacterEncoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterEncoding.h; sourceTree = "<group>"; };
1917
1ABA282A174CC9FD007A6C10 /* GCAPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCAPI.h; sourceTree = "<group>"; };
@@ -109,8 +107,6 @@
109107
1ABA2822174CC9FD007A6C10 /* include */ = {
110108
isa = PBXGroup;
111109
children = (
112-
1ABA2823174CC9FD007A6C10 /* ds */,
113-
1ABA2825174CC9FD007A6C10 /* gc */,
114110
1ABA2827174CC9FD007A6C10 /* js */,
115111
1ABA2835174CC9FD007A6C10 /* js-config.h */,
116112
1ABA2836174CC9FD007A6C10 /* js.msg */,
@@ -139,22 +135,6 @@
139135
path = include;
140136
sourceTree = "<group>";
141137
};
142-
1ABA2823174CC9FD007A6C10 /* ds */ = {
143-
isa = PBXGroup;
144-
children = (
145-
1ABA2824174CC9FD007A6C10 /* BitArray.h */,
146-
);
147-
path = ds;
148-
sourceTree = "<group>";
149-
};
150-
1ABA2825174CC9FD007A6C10 /* gc */ = {
151-
isa = PBXGroup;
152-
children = (
153-
1ABA2826174CC9FD007A6C10 /* Root.h */,
154-
);
155-
path = gc;
156-
sourceTree = "<group>";
157-
};
158138
1ABA2827174CC9FD007A6C10 /* js */ = {
159139
isa = PBXGroup;
160140
children = (

src/jsbcc_source/spidermonkey-ios/include/js-config.h

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,8 @@
3434
useable. See jscpucfg.h. */
3535
/* #undef JS_HAVE_SYS_ISA_DEFS_H */
3636

37-
/* Define to 1 if the <sys/types.h> defines int8_t, etc. */
38-
/* #undef JS_SYS_TYPES_H_DEFINES_EXACT_SIZE_TYPES */
39-
40-
/* Define to 1 if the N-byte __intN types are defined by the
41-
compiler. */
42-
/* #undef JS_HAVE___INTN */
43-
44-
/* Define to 1 if #including <stddef.h> provides definitions for
45-
intptr_t and uintptr_t. */
46-
/* #undef JS_STDDEF_H_HAS_INTPTR_T */
47-
48-
/* Define to 1 if #including <crtdefs.h> provides definitions for
49-
intptr_t and uintptr_t. */
50-
/* #undef JS_CRTDEFS_H_HAS_INTPTR_T */
51-
5237
/* The configure script defines these if it doesn't #define
5338
JS_HAVE_STDINT_H. */
54-
/* #undef JS_INT8_TYPE */
55-
/* #undef JS_INT16_TYPE */
56-
/* #undef JS_INT32_TYPE */
57-
/* #undef JS_INT64_TYPE */
58-
/* #undef JS_INTPTR_TYPE */
5939
#define JS_BYTES_PER_WORD 4
6040

6141
/* Some mozilla code uses JS-friend APIs that depend on JS_METHODJIT being

0 commit comments

Comments
 (0)