Commit 19a492ad by Aaron Leung

Bam, things seem to be linking correctly.

parent 640af580
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
sasscpp: sasscpp.cpp context.cpp functions.cpp document.cpp document_parser.cpp eval_apply.cpp node.cpp node_comparisons.cpp values.cpp prelexer.cpp sasscpp: sasscpp.cpp context.cpp functions.cpp document.cpp document_parser.cpp eval_apply.cpp node.cpp node_comparisons.cpp values.cpp prelexer.cpp
g++ -o bin/sasscpp sassc.cpp context.cpp functions.cpp document.cpp document_parser.cpp eval_apply.cpp node.cpp node_comparisons.cpp values.cpp prelexer.cpp g++ -o bin/sasscpp sassc.cpp context.cpp functions.cpp document.cpp document_parser.cpp eval_apply.cpp node.cpp node_comparisons.cpp values.cpp prelexer.cpp
sassc: sassc.o bin/libsass.a sassc: sassc.o libsass
gcc -o bin/sassc sassc.o -lstdc++ -lsass gcc -o bin/sassc sassc.o libsass.a -lstdc++
sass_obj: sassc.c sassc_obj: sassc.c
gcc -c sassc.c gcc -c sassc.c
libsass: sass_interface.o context.o functions.o document.o document_parser.o eval_apply.o node.o node_comparisons.o values.o prelexer.o libsass: sass_interface.o context.o functions.o document.o document_parser.o eval_apply.o node.o node_comparisons.o values.o prelexer.o
...@@ -23,4 +23,5 @@ test_all: build ...@@ -23,4 +23,5 @@ test_all: build
clean: clean:
rm -rf *.o rm -rf *.o
rm -rf *.a
rm -rf bin/* rm -rf bin/*
\ No newline at end of file
...@@ -109,7 +109,7 @@ namespace Sass { ...@@ -109,7 +109,7 @@ namespace Sass {
Document::~Document() { Document::~Document() {
--context.ref_count; --context.ref_count;
if (context.ref_count == 0) delete &context; // if (context.ref_count == 0) delete &context;
} }
// void Document::eval_pending() // void Document::eval_pending()
......
...@@ -11,9 +11,9 @@ struct sass_context { ...@@ -11,9 +11,9 @@ struct sass_context {
unsigned int output_style; unsigned int output_style;
}; };
sass_context* sass_new_context(); struct sass_context* sass_new_context();
char* sass_compile(sass_context* c_ctx); char* sass_compile(struct sass_context*);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment