Browse Source

Merge e5743faa1e into ad1d4c5e9e

pull/23/merge
GitHub Merge Button 13 years ago
parent
commit
ff90dff6b4
5 changed files with 15 additions and 6 deletions
  1. +6
    -5
      Makefile
  2. +4
    -0
      c_src/decoder.c
  3. +4
    -0
      c_src/encoder.c
  4. BIN
      rebar
  5. +1
    -1
      rebar.config

+ 6
- 5
Makefile View File

@ -1,18 +1,19 @@
REBAR?=./rebar
all: build
clean:
./rebar clean
$(REBAR) clean
rm -rf logs
rm -rf .eunit
rm test/*.beam
rm -f test/*.beam
deps: ./deps/
./rebar get-deps update-deps
$(REBAR) get-deps update-deps
build: deps
./rebar compile
$(REBAR) compile
etap: test/etap.beam test/util.beam
@ -20,7 +21,7 @@ etap: test/etap.beam test/util.beam
eunit:
./rebar eunit skip_deps=true
$(REBAR) eunit skip_deps=true
check: etap eunit

+ 4
- 0
c_src/decoder.c View File

@ -16,6 +16,10 @@
#define STACK_SIZE_INC 64
#define NUM_BUF_LEN 32
#ifdef WINDOWS || WIN32
#define snprintf _snprintf
#endif
enum {
st_value=0,
st_object,

+ 4
- 0
c_src/encoder.c View File

@ -20,6 +20,10 @@ do { \
} \
} while(0)
#ifdef WINDOWS || WIN32
#define inline __inline
#define snprintf _snprintf
#endif
typedef struct {
ErlNifEnv* env;

BIN
rebar View File


+ 1
- 1
rebar.config View File

@ -4,7 +4,7 @@
{port_specs, [{"priv/jiffy.so", ["c_src/*.c"]}]}.
{port_envs, [
{port_env, [
%% Link the spidermonkey library
{".*", "CFLAGS", "$CFLAGS -g -Wall"},

Loading…
Cancel
Save