diff options
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile b/src/Makefile index 06bbcd0..bbe7b23 100644 --- a/src/Makefile +++ b/src/Makefile | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | MODULE=lanes | 8 | MODULE=lanes |
9 | 9 | ||
10 | SRC=lanes.c cancel.cpp compat.cpp threading.cpp tools.cpp state.cpp linda.cpp lindafactory.cpp deep.cpp keeper.cpp universe.cpp | 10 | SRC=lanes.c cancel.cpp compat.cpp threading.cpp tools.cpp state.cpp linda.cpp lindafactory.cpp deep.cpp keeper.cpp universe.cpp intercopycontext.cpp |
11 | 11 | ||
12 | OBJ=$(SRC:.c=.o) | 12 | OBJ=$(SRC:.c=.o) |
13 | 13 | ||
@@ -124,17 +124,17 @@ all: $(MODULE)/core.$(_SO) | |||
124 | # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think) | 124 | # Note: Don't put $(LUA_LIBS) ahead of $^; MSYS will not like that (I think) |
125 | # | 125 | # |
126 | $(MODULE_DIR)/core.$(_SO): $(OBJ) | 126 | $(MODULE_DIR)/core.$(_SO): $(OBJ) |
127 | mkdir -p $(MODULE_DIR) | 127 | mkdir -p $(MODULE_DIR) |
128 | $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@ | 128 | $(CC) $(LIBFLAG) $^ $(LIBS) $(LUA_LIBS) -o $@ |
129 | 129 | ||
130 | clean: | 130 | clean: |
131 | -rm -rf $(MODULE)/core.$(_SO) *.o *.map | 131 | -rm -rf $(MODULE)/core.$(_SO) *.o *.map |
132 | 132 | ||
133 | #--- | 133 | #--- |
134 | # NSLU2 "slug" Linux ARM | 134 | # NSLU2 "slug" Linux ARM |
135 | # | 135 | # |
136 | nslu2: | 136 | nslu2: |
137 | $(MAKE) all CFLAGS="$(CFLAGS) -I/opt/include -L/opt/lib -D_GNU_SOURCE -lpthread" | 137 | $(MAKE) all CFLAGS="$(CFLAGS) -I/opt/include -L/opt/lib -D_GNU_SOURCE -lpthread" |
138 | 138 | ||
139 | #--- | 139 | #--- |
140 | # Cross compiling to Win32 (MinGW on OS X Intel) | 140 | # Cross compiling to Win32 (MinGW on OS X Intel) |
@@ -150,15 +150,15 @@ MINGW_GCC=mingw32-gcc | |||
150 | # i686-pc-mingw32-gcc | 150 | # i686-pc-mingw32-gcc |
151 | 151 | ||
152 | win32: $(WIN32_LUA51)/include/lua.h | 152 | win32: $(WIN32_LUA51)/include/lua.h |
153 | $(MAKE) build CC=$(MINGW_GCC) \ | 153 | $(MAKE) build CC=$(MINGW_GCC) \ |
154 | LUA_FLAGS=-I$(WIN32_LUA51)/include \ | 154 | LUA_FLAGS=-I$(WIN32_LUA51)/include \ |
155 | LUA_LIBS="-L$(WIN32_LUA51) -llua51" \ | 155 | LUA_LIBS="-L$(WIN32_LUA51) -llua51" \ |
156 | _SO=dll \ | 156 | _SO=dll \ |
157 | SO_FLAGS=-shared | 157 | SO_FLAGS=-shared |
158 | 158 | ||
159 | $(WIN32_LUA51)/include/lua.h: | 159 | $(WIN32_LUA51)/include/lua.h: |
160 | @echo "Usage: make win32 WIN32_LUA51=<path of extracted LuaBinaries dll8 and dev packages>" | 160 | @echo "Usage: make win32 WIN32_LUA51=<path of extracted LuaBinaries dll8 and dev packages>" |
161 | @echo " [MINGW_GCC=...mingw32-gcc]" | 161 | @echo " [MINGW_GCC=...mingw32-gcc]" |
162 | @false | 162 | @false |
163 | 163 | ||
164 | .PROXY: all clean nslu2 win32 | 164 | .PROXY: all clean nslu2 win32 |