Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some fixes for win32 #233

Merged
merged 2 commits into from Jan 12, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -26,7 +26,7 @@ ifneq (,$(CARGO_FEATURE_DEBUGMOZJS))
CFLAGS += -g -O0 -DDEBUG -D_DEBUG
endif

CFLAGS += -I$(DEP_MOZJS_OUTDIR)/dist/include
CFLAGS += -I$(DEP_MOZJS_OUTDIR)/dist/include -include $(DEP_MOZJS_OUTDIR)/js/src/js-confdefs.h

.PHONY: all
all: $(OUT_DIR)/libjsglue.a
@@ -70,17 +70,6 @@ use jsapi::{JSContext, Heap};
use jsval::JSVal;
use rust::GCMethods;

#[link(name = "jsglue")]
extern { }

#[cfg(target_os = "android")]
#[link(name = "stdc++")]
extern { }

#[cfg(target_os = "android")]
#[link(name = "gcc")]
extern { }

#[inline(always)]
pub unsafe fn JS_ARGV(_cx: *mut JSContext, vp: *mut JSVal) -> *mut JSVal {
vp.offset(2)
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.