Merge pull request #2 from um68/master

fix for RCF and boost-context
KjellSchubert · Feb 11, 2015 · e40e232 · e40e232
2 parents 5f05e2a + cfa5687
commit e40e232
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/library/boost-context/1.57.0.gyp b/library/boost-context/1.57.0.gyp
@@ -54,6 +54,7 @@
             "sources": [
                 # cpp files just error, the impl is in src/asm
                 #"1.57.0/context-boost-1.57.0/src/*.cpp"
+
             ],
 
             # how to best select the variant of the asm file that should be
@@ -79,14 +80,13 @@
                 }], 
                 ["OS=='mac'", {
                     "sources": [
-                        "1.57.0/context-boost-1.57.0/src/asm/jump_x86_64_ms_pe_masm.asm",
-                        "1.57.0/context-boost-1.57.0/src/asm/make_x86_64_ms_pe_masm.asm"
+                        "1.57.0/context-boost-1.57.0/src/asm/jump_x86_64_sysv_macho_gas.S",
+                        "1.57.0/context-boost-1.57.0/src/asm/make_x86_64_sysv_macho_gas.S"
                     ]
                 }], 
                 ["OS=='iOS'", {
                     "sources": [
-                        "1.57.0/context-boost-1.57.0/src/asm/jump_arm_aapcs_pe_armasm.asm",
-                        "1.57.0/context-boost-1.57.0/src/asm/make_arm_aapcs_pe_armasm.asm"
+                        "1.57.0/context-boost-1.57.0/src/dummy.cpp"
                     ]
                 }], 
 

diff --git a/library/rcf/RCF-2.0.1.101-config.tar.gz b/library/rcf/RCF-2.0.1.101-config.tar.gz