diff options
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile index 04d1cca0..f4a6015f 100644 --- a/GNUmakefile +++ b/GNUmakefile | |||
| @@ -93,11 +93,11 @@ binary: luarocks $(buildbinarydir)/luarocks.exe $(buildbinarydir)/luarocks-admin | |||
| 93 | 93 | ||
| 94 | $(buildbinarydir)/luarocks.exe: src/bin/luarocks $(LUAROCKS_FILES) | 94 | $(buildbinarydir)/luarocks.exe: src/bin/luarocks $(LUAROCKS_FILES) |
| 95 | (unset $(LUA_ENV_VARS); \ | 95 | (unset $(LUA_ENV_VARS); \ |
| 96 | "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) | 96 | "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/admin/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(BINARY_SYSROOT)) |
| 97 | 97 | ||
| 98 | $(buildbinarydir)/luarocks-admin.exe: src/bin/luarocks-admin $(LUAROCKS_FILES) | 98 | $(buildbinarydir)/luarocks-admin.exe: src/bin/luarocks-admin $(LUAROCKS_FILES) |
| 99 | (unset $(LUA_ENV_VARS); \ | 99 | (unset $(LUA_ENV_VARS); \ |
| 100 | "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(SYSROOT)) | 100 | "$(LUA)" binary/all_in_one "$<" "$(LUA_DIR)" "^src/luarocks/cmd/" "$(luarocksconfdir)" "$(@D)" "$(FORCE_CONFIG)" $(BINARY_PLATFORM) $(CC) $(NM) $(BINARY_SYSROOT)) |
| 101 | 101 | ||
| 102 | # ---------------------------------------- | 102 | # ---------------------------------------- |
| 103 | # Regular install | 103 | # Regular install |
| @@ -155,11 +155,21 @@ bootstrap: luarocks $(DESTDIR)$(luarocksconfdir)/config-$(LUA_VERSION).lua | |||
| 155 | # Windows binary build | 155 | # Windows binary build |
| 156 | # ---------------------------------------- | 156 | # ---------------------------------------- |
| 157 | 157 | ||
| 158 | windows-binary: luarocks | 158 | windows-binary: windows-binary-32 windows-binary-64 |
| 159 | $(MAKE) -f binary/Makefile.windows windows-binary | ||
| 160 | 159 | ||
| 161 | windows-clean: | 160 | windows-clean: windows-clean-32 windows-clean-64 |
| 162 | $(MAKE) -f binary/Makefile.windows windows-clean | 161 | |
| 162 | windows-binary-32: luarocks | ||
| 163 | $(MAKE) -f binary/Makefile.windows windows-binary MINGW_PREFIX=i686-w64-mingw32 OPENSSL_PLATFORM=mingw | ||
| 164 | |||
| 165 | windows-clean-32: | ||
| 166 | $(MAKE) -f binary/Makefile.windows windows-clean MINGW_PREFIX=i686-w64-mingw32 OPENSSL_PLATFORM=mingw | ||
| 167 | |||
| 168 | windows-binary-64: luarocks | ||
| 169 | $(MAKE) -f binary/Makefile.windows windows-binary MINGW_PREFIX=x86_64-w64-mingw32 OPENSSL_PLATFORM=mingw64 | ||
| 170 | |||
| 171 | windows-clean-64: | ||
| 172 | $(MAKE) -f binary/Makefile.windows windows-clean MINGW_PREFIX=x86_64-w64-mingw32 OPENSSL_PLATFORM=mingw64 | ||
| 163 | 173 | ||
| 164 | # ---------------------------------------- | 174 | # ---------------------------------------- |
| 165 | # Clean | 175 | # Clean |