--- a/stx_libview2.st Sun Feb 05 00:18:48 2017 +0000
+++ b/stx_libview2.st Sat Sep 30 22:41:09 2017 +0100
@@ -126,7 +126,7 @@
!!if defined(USEMINGW32) || defined(USEMINGW64)
!! if defined(USEMINGW32)
LIBJPEG_TARGET = i686-pc-mingw32
-!! else
+!! else
LIBJPEG_TARGET = x86_64-w64-mingw32
!! endif
LIBJPEG=$(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\.libs\libjpeg.a
@@ -143,12 +143,38 @@
"Modified: / 23-01-2017 / 12:09:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+additionalDefinitions_make_dot_proto
+ ^ '
+# LIBJPEG_DIR=$(TOP)/support/libjpeg-6a
+LIBJPEG_DIR=$(TOP)/support/libjpeg-9
+
+# Following is a hack for Smalltalk/X jv-branch 6.x.x builds
+# that DO NOT use GNU target triplets as BUILD_TARGET.
+# So, normalize here:
+ifeq ($(BUILD_TARGET), linux-i386)
+LIBJPEG_TARGET = i686-pc-linux-gnu
+else
+ifeq ($(BUILD_TARGET), linux-x86_64)
+LIBJPEG_TARGET = x86_64-pc-linux-gnu
+else
+LIBJPEG_TARGET = $(BUILD_TARGET)
+endif
+endif
+LIBJPEG=$(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/.libs/libjpeg.a
+
+'
+
+ "Created: / 24-09-2017 / 19:57:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
additionalLinkLibraries_bc_dot_mak
^ '$(LIBJPEG)'
!
additionalLinkLibraries_make_dot_proto
- ^ '$(JPEGLIB_LD_ARG)'
+ ^ '$(LIBJPEG)'
+
+ "Modified: / 24-09-2017 / 19:57:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_bc_dot_mak
@@ -168,7 +194,7 @@
-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)
$(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\jconfig.h
-$(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\jconfig.h: $(LIBJPEG)
+$(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\jconfig.h: $(LIBJPEG)
!!else
$(LIBJPEG):
@@ -176,66 +202,35 @@
$(MAKE_BAT)
cd ..\..\libview2
$(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h
-$(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG)
+$(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG)
!!endif
'
"Created: / 22-08-2006 / 23:58:29 / cg"
- "Modified: / 23-01-2017 / 12:19:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ "Modified: / 24-09-2017 / 20:01:30 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_make_dot_proto
^ '
+$(LIBJPEG): $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/config.status
+ $(MAKE) -C $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)
-libjpeg: $(LIBJPEG_DIR)/Makefile
- cd $(LIBJPEG_DIR); $(MAKE) $(MAKE_JPEGLIB_ARG)
+$(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/config.status:
+ mkdir -p $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)
+ cd $(LIBJPEG_DIR)/$(LIBJPEG_TARGET) && CC="$(CC) $(CCCONFOPT)" ../configure --build=$(LIBJPEG_TARGET)
-#
-# prelink JPEGReader.o with libjpeg
-#
-JPEGReader_prelinked: $(LIBJPEG)
- @$(MAKE) JPEGReader.$(O) \
- CC="$(LIBJPEG_CC)" \
- OPT="$(LIBJPEG_OPT)" \
- LOCALDEFS="-I$(LIBJPEG_DIR)" \
- LIBNAME="$(LIBNAME)" \
- STCOPT="$(STCOPT)" \
- STCLOCALOPT="$(STCLOCALOPT)" \
- CCLOCALOPT="$(CCLOCALOPT)" \
- LINKOBJRULE="$(LINKOBJRULE)"
- @if [ "$(NO_PRELINK_LIBJPEG)" = "" ]; then \
- echo; \
- echo "prelinking JPEGReader with libjpeg ..."; \
- echo; \
- echo $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG); \
- mv JPEGReader.$(O) __JPEGReader.$(O) && \
- $(CLASSLIB_LD) $(LD_REL_FLAG) -o JPEGReader.$(O) __JPEGReader.$(O) $(LIBJPEG) && \
- rm -f __JPEGReader.$(O); \
- echo; \
- fi
+clobber::
+ rm -rf $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)
-$(LIBJPEG_DIR)/libjpeg.a: $(LIBJPEG_MAKE_LIB)
- cp $(LIBJPEG_MAKE_LIB)/.libs/libjpeg.a $(LIBJPEG)
+clean::
+ if [ -f $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/Makefile ]; then make -C $(LIBJPEG_DIR)/$(LIBJPEG_TARGET) clean; fi
-#the following is needed for linux; LIBJPEG_MAKE_LIB is expanded to: $(LIBJPEG_DIR)/.libs/libjpeg.a
-#do not replace taget below by LIBJPEG_MAKE_LIB, because it may be empty for other systems (osx)
-$(LIBJPEG_DIR)/.libs/libjpeg.a: $(LIBJPEG_DIR)/Makefile $(LIBJPEG_DIR)/*.c $(LIBJPEG_DIR)/*.h
- @-echo
- @-echo "making libjpeg support library ..."
- @-echo
- cd $(LIBJPEG_DIR) \
- && $(MAKE) all CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT) $(CCCONFOPT)"
- @-echo
-
-$(LIBJPEG_DIR)/Makefile:
- @-echo
- @-echo "configure libjpeg support library ..."
- @-echo
- cd $(LIBJPEG_DIR) && ./configure CC="$(LIBJPEG_CC)" OPT="$(LIBJPEG_OPT)" CFLAGS="$(LIBJPEG_OPT) $(CCCONFOPT)"'
+'
"Created: / 22-08-2006 / 23:58:51 / cg"
+ "Modified: / 24-09-2017 / 20:35:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalTargets_bc_dot_mak
@@ -249,13 +244,14 @@
additionalTargets_make_dot_proto
"additional targets to be added to the make.proto file."
- ^ '$(JPEGLIB_MAKE_TARGET) $(JPEGREADER_PRELINKED)'
+ ^ '$(LIBJPEG)'
"Created: / 22-08-2006 / 23:54:37 / cg"
+ "Modified: / 24-09-2017 / 20:01:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
localIncludes
- ^ '$(JPEG_INCLUDE)'
+ ^ '-I$(LIBJPEG_DIR)/$(LIBJPEG_TARGET) -I$(LIBJPEG_DIR)'
!
stcOptimizationOptions