Skip to content

Commit

Permalink
Added support for x64, removed node-ffi
Browse files Browse the repository at this point in the history
  • Loading branch information
karliky committed Jan 19, 2014
1 parent 45a4f50 commit 854edee
Show file tree
Hide file tree
Showing 87 changed files with 22,605 additions and 567 deletions.
215 changes: 215 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf

#############
## Windows detritus
#############

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
.DS_Store


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg
4 changes: 2 additions & 2 deletions binding.gyp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"targets": [
{
"target_name": "helpers",
"sources": [ "helpers.cc" ]
"target_name": "crazy",
"sources": [ "crazy.cc" ]
}
]
}
Binary file removed build/Release/helpers.exp
Binary file not shown.
Binary file removed build/Release/helpers.lib
Binary file not shown.
Binary file removed build/Release/helpers.node
Binary file not shown.
Binary file removed build/Release/helpers.pdb
Binary file not shown.
Binary file removed build/Release/obj/helpers/CL.read.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/CL.write.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/cl.command.1.tlog
Binary file not shown.
10 changes: 0 additions & 10 deletions build/Release/obj/helpers/helpers.dll.intermediate.manifest

This file was deleted.

2 changes: 0 additions & 2 deletions build/Release/obj/helpers/helpers.lastbuildstate

This file was deleted.

Binary file removed build/Release/obj/helpers/helpers.obj
Binary file not shown.
90 changes: 0 additions & 90 deletions build/Release/obj/helpers/helpers.write.1.tlog

This file was deleted.

Binary file removed build/Release/obj/helpers/link.command.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/link.read.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/link.write.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/mt.command.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/mt.read.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/mt.write.1.tlog
Binary file not shown.
Binary file removed build/Release/obj/helpers/vc100.pdb
Binary file not shown.
14 changes: 7 additions & 7 deletions build/binding.sln
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "helpers", "helpers.vcxproj", "{A004BF47-539B-934F-A0A8-5BE101CBFAB5}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crazy", "crazy.vcxproj", "{49C4C32B-3445-A886-4D34-9A6A76D8F3DF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
Debug|x64 = Debug|x64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A004BF47-539B-934F-A0A8-5BE101CBFAB5}.Debug|Win32.ActiveCfg = Debug|Win32
{A004BF47-539B-934F-A0A8-5BE101CBFAB5}.Debug|Win32.Build.0 = Debug|Win32
{A004BF47-539B-934F-A0A8-5BE101CBFAB5}.Release|Win32.ActiveCfg = Release|Win32
{A004BF47-539B-934F-A0A8-5BE101CBFAB5}.Release|Win32.Build.0 = Release|Win32
{49C4C32B-3445-A886-4D34-9A6A76D8F3DF}.Debug|x64.ActiveCfg = Debug|x64
{49C4C32B-3445-A886-4D34-9A6A76D8F3DF}.Debug|x64.Build.0 = Debug|x64
{49C4C32B-3445-A886-4D34-9A6A76D8F3DF}.Release|x64.ActiveCfg = Release|x64
{49C4C32B-3445-A886-4D34-9A6A76D8F3DF}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
22 changes: 16 additions & 6 deletions build/config.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,35 @@
"default_configuration": "Release",
"defines": [],
"include_dirs": [],
"libraries": []
"libraries": [],
"msbuild_toolset": "v110"
},
"variables": {
"clang": 0,
"host_arch": "ia32",
"node_install_npm": "true",
"node_install_waf": "true",
"node_prefix": "",
"node_shared_cares": "false",
"node_shared_http_parser": "false",
"node_shared_libuv": "false",
"node_shared_openssl": "false",
"node_shared_v8": "false",
"node_shared_zlib": "false",
"node_tag": "",
"node_unsafe_optimizations": 0,
"node_use_dtrace": "false",
"node_use_etw": "true",
"node_use_openssl": "true",
"target_arch": "ia32",
"node_use_perfctr": "true",
"node_use_systemtap": "false",
"python": "c:\\python27\\python.exe",
"target_arch": "x64",
"v8_enable_gdbjit": 0,
"v8_no_strict_aliasing": 1,
"v8_use_snapshot": "false",
"v8_use_snapshot": "true",
"visibility": "",
"nodedir": "C:\\Users\\WobCraft\\.node-gyp\\0.8.11",
"copy_dev_lib": "true"
"nodedir": "C:\\Users\\WobCraft\\.node-gyp\\0.10.15",
"copy_dev_lib": "true",
"standalone_static_library": 1
}
}
Loading

0 comments on commit 854edee

Please sign in to comment.