[Issue facebook/css-layout#78]: Implemented alignContent ; #79

Merged
prenaux merged 15 commits from master into master 2015-05-17 08:58:05 -07:00
21 changed files with 2370 additions and 8178 deletions
Showing only changes of commit 176bb6097b - Show all commits

View File

@@ -24,10 +24,22 @@ all: c c_test java java_test
c: transpile_all c: transpile_all
ifeq ($(OS),Windows_NT)
c_test: c
@cl -nologo -Zi -Tpsrc/__tests__/Layout-test.c -Tpsrc/Layout.c -Tpsrc/Layout-test-utils.c -link -incremental:no -out:"$(C_TEST_EXE)" && "$(C_TEST_EXE)"
@rm "$(C_TEST_EXE)" ./*.obj ./*.pdb
else
c_test: c c_test: c
@gcc -std=c99 -Werror -Wno-padded $(FILES) -lm -o "$(C_TEST_EXE)" && "$(C_TEST_EXE)" @gcc -std=c99 -Werror -Wno-padded $(FILES) -lm -o "$(C_TEST_EXE)" && "$(C_TEST_EXE)"
@rm "$(C_TEST_EXE)" @rm "$(C_TEST_EXE)"
debug:
@gcc -std=c99 -ggdb $(FILES) -lm -o $(C_TEST_EXE) && $(LLDB) $(C_TEST_EXE)
@rm $(C_TEST_EXE)
endif
$(JAVA_LIB_DIR): $(JAVA_LIB_DIR):
mkdir $(JAVA_LIB_DIR) mkdir $(JAVA_LIB_DIR)
@@ -51,13 +63,3 @@ java_test: java
transpile_all: ./src/transpile.js transpile_all: ./src/transpile.js
@node ./src/transpile.js @node ./src/transpile.js
debug:
@gcc -std=c99 -ggdb $(FILES) -lm -o $(C_TEST_EXE) && $(LLDB) $(C_TEST_EXE)
@rm $(C_TEST_EXE)
ifeq ($(OS),Windows_NT)
c_test_msvc: c
@cl -nologo -Zi -Tpsrc/__tests__/Layout-test.c -Tpsrc/Layout.c -Tpsrc/Layout-test-utils.c -link -incremental:no -out:"$(C_TEST_EXE)" && "$(C_TEST_EXE)"
@rm "$(C_TEST_EXE)" ./*.obj ./*.pdb
endif