equal
deleted
inserted
replaced
118 ' |
118 ' |
119 ! |
119 ! |
120 |
120 |
121 additionalDefinitions_bc_dot_mak |
121 additionalDefinitions_bc_dot_mak |
122 ^ ' |
122 ^ ' |
123 LIBJPEG_DIR=$(TOP)\support\libjpeg-6a |
123 #LIBJPEG_DIR=$(TOP)\support\libjpeg-6a |
|
124 LIBJPEG_DIR=$(TOP)\support\libjpeg-9 |
124 |
125 |
125 !!if defined(USEMINGW32) || defined(USEMINGW64) |
126 !!if defined(USEMINGW32) || defined(USEMINGW64) |
126 LIBJPEG=$(LIBJPEG_DIR)\$(OBJDIR)\libjpeg.a |
127 LIBJPEG=$(LIBJPEG_DIR)\.libs\libjpeg.a |
|
128 !! if defined(USEMINGW32) |
|
129 LIBJPEG_TARGET = i686-pc-mingw32 |
|
130 !! else |
|
131 LIBJPEG_TARGET = x86_64-w64-mingw32 |
|
132 !! endif |
127 !!else |
133 !!else |
128 LIBJPEG=$(LIBJPEG_DIR)\$(OBJDIR)\libjpeg.lib |
134 LIBJPEG=$(LIBJPEG_DIR)\$(OBJDIR)\libjpeg.lib |
129 !!endif |
135 !!endif |
130 |
136 |
131 CLOCAL_INCL=-I"$(LIBJPEG_DIR)" |
137 CLOCAL_INCL=-I"$(LIBJPEG_DIR)" |
142 ^ '$(JPEGLIB_LD_ARG)' |
148 ^ '$(JPEGLIB_LD_ARG)' |
143 ! |
149 ! |
144 |
150 |
145 additionalRules_bc_dot_mak |
151 additionalRules_bc_dot_mak |
146 ^ ' |
152 ^ ' |
|
153 !!if defined(USEMINGW32) || defined(USEMINGW64) |
|
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 |
|
156 |
|
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 |
|
159 |
|
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) |
|
162 |
|
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) |
|
165 |
|
166 !!else |
147 $(LIBJPEG): |
167 $(LIBJPEG): |
148 cd $(LIBJPEG_DIR) |
168 cd $(LIBJPEG_DIR) |
149 $(MAKE_BAT) |
169 $(MAKE_BAT) |
150 cd ..\..\libview2 |
170 cd ..\..\libview2 |
|
171 !!endif |
151 |
172 |
152 $(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h |
173 $(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h |
153 |
174 |
154 $(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG) |
175 $(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG) |
155 ' |
176 ' |