equal
deleted
inserted
replaced
150 |
150 |
151 additionalRules_bc_dot_mak |
151 additionalRules_bc_dot_mak |
152 ^ ' |
152 ^ ' |
153 !!if defined(USEMINGW32) || defined(USEMINGW64) |
153 !!if defined(USEMINGW32) || defined(USEMINGW64) |
154 $(LIBJPEG): $(LIBJPEG_DIR)/config.status |
154 $(LIBJPEG): $(LIBJPEG_DIR)/config.status |
155 pushd $(LIBJPEG_DIR) & set "PATH=C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make |
155 pushd $(LIBJPEG_DIR) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make |
156 |
156 |
157 $(LIBJPEG_DIR)/config.status: |
157 $(LIBJPEG_DIR)/config.status: |
158 pushd $(LIBJPEG_DIR) & set "PATH=C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & bash configure --build=$(LIBJPEG_TARGET) & echo #define HAVE_PROTOTYPES >> jconfig.h |
158 pushd $(LIBJPEG_DIR) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & bash configure --build=$(LIBJPEG_TARGET) & echo #define HAVE_PROTOTYPES >> jconfig.h |
159 |
159 |
160 clobber:: |
160 clobber:: |
161 -pushd $(LIBJPEG_DIR) & set "PATH=C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & IF EXIST makefile (make distclean) |
161 -pushd $(LIBJPEG_DIR) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & IF EXIST makefile (make distclean) |
162 |
162 |
163 clean:: |
163 clean:: |
164 -pushd $(LIBJPEG_DIR) & set "PATH=C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & IF EXIST makefile (make clean) |
164 -pushd $(LIBJPEG_DIR) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & IF EXIST makefile (make clean) |
165 |
165 |
166 !!else |
166 !!else |
167 $(LIBJPEG): |
167 $(LIBJPEG): |
168 cd $(LIBJPEG_DIR) |
168 cd $(LIBJPEG_DIR) |
169 $(MAKE_BAT) |
169 $(MAKE_BAT) |