--- a/stx_libview2.st Thu Jan 19 12:00:14 2017 +0000
+++ b/stx_libview2.st Mon Jan 23 12:42:33 2017 +0000
@@ -124,20 +124,23 @@
LIBJPEG_DIR=$(TOP)\support\libjpeg-9
!!if defined(USEMINGW32) || defined(USEMINGW64)
-LIBJPEG=$(LIBJPEG_DIR)\.libs\libjpeg.a
!! if defined(USEMINGW32)
LIBJPEG_TARGET = i686-pc-mingw32
!! else
LIBJPEG_TARGET = x86_64-w64-mingw32
!! endif
+LIBJPEG=$(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\.libs\libjpeg.a
+CLOCAL_INCL=-I"$(LIBJPEG_DIR)" -I"$(LIBJPEG_DIR)\$(LIBJPEG_TARGET)"
!!else
LIBJPEG=$(LIBJPEG_DIR)\$(OBJDIR)\libjpeg.lib
+CLOCAL_INCL=-I"$(LIBJPEG_DIR)"
!!endif
-CLOCAL_INCL=-I"$(LIBJPEG_DIR)"
+
'
"Created: / 22-08-2006 / 23:58:05 / cg"
+ "Modified: / 23-01-2017 / 12:09:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalLinkLibraries_bc_dot_mak
@@ -151,31 +154,36 @@
additionalRules_bc_dot_mak
^ '
!!if defined(USEMINGW32) || defined(USEMINGW64)
-$(LIBJPEG): $(LIBJPEG_DIR)/config.status
- pushd $(LIBJPEG_DIR) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make
+$(LIBJPEG): $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/config.status
+ pushd $(LIBJPEG_DIR)\$(LIBJPEG_TARGET) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make
-$(LIBJPEG_DIR)/config.status:
- 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
+$(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/config.status:
+ -md $(LIBJPEG_DIR)\$(LIBJPEG_TARGET)
+ pushd $(LIBJPEG_DIR)\$(LIBJPEG_TARGET) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & bash ../configure --build=$(LIBJPEG_TARGET)
clobber::
- -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)
+ -rd /S /Q $(LIBJPEG_DIR)\$(LIBJPEG_TARGET)
clean::
-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)
+
!!else
$(LIBJPEG):
cd $(LIBJPEG_DIR)
$(MAKE_BAT)
cd ..\..\libview2
+$(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h
+$(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG)
!!endif
-$(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h
-$(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG)
'
"Created: / 22-08-2006 / 23:58:29 / cg"
+ "Modified: / 23-01-2017 / 12:19:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
additionalRules_make_dot_proto
@@ -349,23 +357,26 @@
ValueHolderWithRememberedPreviousValue
ValueHolderWithWeakDependents
AspectAdaptorWithDefault
+ (Wrapper autoload)
+ (TranslatingWrapper autoload)
+ (LayoutWrapper autoload)
+ (BoundedWrapper autoload)
(AVIReader autoload)
(ApplicationController autoload)
(BlitImageReader autoload)
(BorderedWrapper autoload)
- (BoundedWrapper autoload)
(CompositePart autoload)
(CompositeTransform autoload)
(ConvertedValue autoload)
(DependentPart autoload)
(FLIReader autoload)
(FaceReader autoload)
+ (GeometricWrapper autoload)
+ (StrokingOrFillingWrapper autoload)
(FillingWrapper autoload)
- (GeometricWrapper autoload)
(HersheyFont autoload)
(Insets autoload)
(IrisRGBReader autoload)
- (LayoutWrapper autoload)
(MatrixTransform2x3 autoload)
(PBMReader autoload)
(PCXReader autoload)
@@ -373,15 +384,14 @@
(PluggableView autoload)
(RIFFReader autoload)
(ST80FormReader autoload)
- (StrokingOrFillingWrapper autoload)
(StrokingWrapper autoload)
(SunRasterReader autoload)
(TargaReader autoload)
- (TranslatingWrapper autoload)
(ViewForwardingController autoload)
- (Wrapper autoload)
(XWDReader autoload)
)
+
+ "Modified: / 23-01-2017 / 12:12:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
extensionMethodNames
@@ -431,5 +441,9 @@
version_CVS
^ '$Header$'
+!
+
+version_HG
+ ^ '$Changeset: <not expanded> $'
! !