Skip to content
This repository was archived by the owner on May 24, 2024. It is now read-only.

Commit 04a834c

Browse files
TingPingTingPing
committed
Merge branch 'x64'
2 parents 00b6ab0 + 2421260 commit 04a834c

5 files changed

Lines changed: 78 additions & 9 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ javascript.so
22
*.patch
33

44
# Visual Studio
5-
win32/[Dd]ebug/
6-
win32/[Rr]elease/
5+
win32/Win32/
6+
win32/x64/
77
win32/*sdf
88
win32/*.user

‎javascript.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ hjs_util_datefromtime (JSContext *context, time_t server_time)
202202
if (!JS_GetProperty(context, date_constructor, "prototype", &date_prototype))
203203
return JSVAL_VOID;
204204

205-
date_class = JS_GetClass(context, JSVAL_TO_OBJECT (date_prototype));
205+
date_class = JS_GET_CLASS(context, JSVAL_TO_OBJECT (date_prototype));
206206

207207
if (!JS_NewNumberValue(context, ((double) server_time) * 1000, &(args[0])))
208208
return JSVAL_VOID;

‎win32/hexchat-javascript.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ImportGroup Label="PropertySheets" />
44
<PropertyGroup Label="UserMacros">
5-
<YourSDKPath>..\..\xulrunner-sdk</YourSDKPath>
5+
<YourSDKPath>C:\mozilla-build\js-1.8.5\</YourSDKPath>
66
</PropertyGroup>
77
</Project>

‎win32/hexchat-javascript.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,19 @@ EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution
88
Debug|Win32 = Debug|Win32
9+
Debug|x64 = Debug|x64
910
Release|Win32 = Release|Win32
11+
Release|x64 = Release|x64
1012
EndGlobalSection
1113
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1214
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Debug|Win32.ActiveCfg = Debug|Win32
1315
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Debug|Win32.Build.0 = Debug|Win32
16+
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Debug|x64.ActiveCfg = Debug|x64
17+
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Debug|x64.Build.0 = Debug|x64
1418
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Release|Win32.ActiveCfg = Release|Win32
1519
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Release|Win32.Build.0 = Release|Win32
20+
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Release|x64.ActiveCfg = Release|x64
21+
{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}.Release|x64.Build.0 = Release|x64
1622
EndGlobalSection
1723
GlobalSection(SolutionProperties) = preSolution
1824
HideSolutionNode = FALSE

‎win32/hexchat-javascript.vcxproj‎

Lines changed: 68 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{6A6C5A32-DB5E-405E-9D96-F3C8AA19C5E9}</ProjectGuid>
@@ -21,32 +29,72 @@
2129
<PlatformToolset>v110</PlatformToolset>
2230
<CharacterSet>MultiByte</CharacterSet>
2331
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
33+
<ConfigurationType>DynamicLibrary</ConfigurationType>
34+
<UseDebugLibraries>true</UseDebugLibraries>
35+
<PlatformToolset>v110</PlatformToolset>
36+
<CharacterSet>MultiByte</CharacterSet>
37+
</PropertyGroup>
2438
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2539
<ConfigurationType>DynamicLibrary</ConfigurationType>
2640
<UseDebugLibraries>false</UseDebugLibraries>
2741
<PlatformToolset>v110</PlatformToolset>
2842
<WholeProgramOptimization>true</WholeProgramOptimization>
2943
<CharacterSet>MultiByte</CharacterSet>
3044
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
46+
<ConfigurationType>DynamicLibrary</ConfigurationType>
47+
<UseDebugLibraries>false</UseDebugLibraries>
48+
<PlatformToolset>v110</PlatformToolset>
49+
<WholeProgramOptimization>true</WholeProgramOptimization>
50+
<CharacterSet>MultiByte</CharacterSet>
51+
</PropertyGroup>
3152
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3253
<ImportGroup Label="ExtensionSettings">
3354
</ImportGroup>
3455
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3556
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3657
<Import Project="hexchat-javascript.props" />
3758
</ImportGroup>
59+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
60+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61+
<Import Project="hexchat-javascript.props" />
62+
</ImportGroup>
3863
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
3964
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4065
<Import Project="hexchat-javascript.props" />
4166
</ImportGroup>
67+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
68+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
69+
<Import Project="hexchat-javascript.props" />
70+
</ImportGroup>
4271
<PropertyGroup Label="UserMacros" />
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
73+
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
74+
<IntDir>$(Platform)\$(Configuration)\</IntDir>
75+
</PropertyGroup>
4376
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4477
<ClCompile>
4578
<WarningLevel>Level3</WarningLevel>
4679
<Optimization>Disabled</Optimization>
4780
<SDLCheck>true</SDLCheck>
48-
<AdditionalIncludeDirectories>$(YourSDKPath)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
49-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81+
<AdditionalIncludeDirectories>$(YourSDKPath)\$(PlatformName)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83+
</ClCompile>
84+
<Link>
85+
<GenerateDebugInformation>true</GenerateDebugInformation>
86+
<ModuleDefinitionFile>hexchat-javascript.def</ModuleDefinitionFile>
87+
<AdditionalDependencies>mozjs.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
88+
<AdditionalLibraryDirectories>$(YourSDKPath)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
89+
</Link>
90+
</ItemDefinitionGroup>
91+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
92+
<ClCompile>
93+
<WarningLevel>Level3</WarningLevel>
94+
<Optimization>Disabled</Optimization>
95+
<SDLCheck>true</SDLCheck>
96+
<AdditionalIncludeDirectories>$(YourSDKPath)\$(PlatformName)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
97+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5098
</ClCompile>
5199
<Link>
52100
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -60,14 +108,29 @@
60108
<WarningLevel>Level3</WarningLevel>
61109
<Optimization>Full</Optimization>
62110
<SDLCheck>true</SDLCheck>
63-
<AdditionalIncludeDirectories>$(YourSDKPath)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
111+
<AdditionalIncludeDirectories>$(YourSDKPath)\$(PlatformName)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
112+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
65113
</ClCompile>
66114
<Link>
67115
<GenerateDebugInformation>true</GenerateDebugInformation>
68116
<ModuleDefinitionFile>hexchat-javascript.def</ModuleDefinitionFile>
69117
<AdditionalDependencies>mozjs.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
70-
<AdditionalLibraryDirectories>$(YourSDKPath)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
118+
<AdditionalLibraryDirectories>$(YourSDKPath)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
119+
</Link>
120+
</ItemDefinitionGroup>
121+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
122+
<ClCompile>
123+
<WarningLevel>Level3</WarningLevel>
124+
<Optimization>Full</Optimization>
125+
<SDLCheck>true</SDLCheck>
126+
<AdditionalIncludeDirectories>$(YourSDKPath)\$(PlatformName)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;XP_WIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128+
</ClCompile>
129+
<Link>
130+
<GenerateDebugInformation>true</GenerateDebugInformation>
131+
<ModuleDefinitionFile>hexchat-javascript.def</ModuleDefinitionFile>
132+
<AdditionalDependencies>mozjs.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
133+
<AdditionalLibraryDirectories>$(YourSDKPath)\$(PlatformName)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
71134
</Link>
72135
</ItemDefinitionGroup>
73136
<ItemGroup>

0 commit comments

Comments
 (0)