diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:58:39 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-15 22:58:39 +0000 |
| commit | 5573f9f150d513ed3f996722e2b57b58cfb24f3b (patch) | |
| tree | 44a46d84515c9c8943ab20aa89fce0acce0fa5a5 /unix | |
| parent | 4899ff9470734f0593bbe1f5272bc3d23facf7f7 (diff) | |
| parent | 3e4ed25138b7ffc295843dfc11e44bccfb22ab9c (diff) | |
| download | micropython-5573f9f150d513ed3f996722e2b57b58cfb24f3b.tar.gz micropython-5573f9f150d513ed3f996722e2b57b58cfb24f3b.zip | |
Merge branch 'str2int' of github.com:xyb/micropython into xyb-str2int
Conflicts:
py/objint.c
unix-cpy/Makefile
unix/Makefile
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/Makefile b/unix/Makefile index 2c54cf2d4c..9055909fb4 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -11,7 +11,7 @@ ECHO = @echo # compiler settings CC = gcc -CFLAGS = -I. -I$(PY_SRC) -Wall -Werror -ansi -std=gnu99 +CFLAGS = -I. -I$(PY_SRC) -Wall -Werror -ansi -std=gnu99 -DUNIX LDFLAGS = -lm #Debugging/Optimization |