stx_libview2.st
branchjv
changeset 3855 1db7742d33ad
parent 3798 85687906ec72
child 3856 47878d05e8e8
equal deleted inserted replaced
3854:4afd107bc911 3855:1db7742d33ad
   122     ^ '
   122     ^ '
   123 # LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
   123 # LIBJPEG_DIR=$(TOP)\support\libjpeg-6a
   124 LIBJPEG_DIR=$(TOP)\support\libjpeg-9
   124 LIBJPEG_DIR=$(TOP)\support\libjpeg-9
   125 
   125 
   126 !!if defined(USEMINGW32) || defined(USEMINGW64)
   126 !!if defined(USEMINGW32) || defined(USEMINGW64)
   127 LIBJPEG=$(LIBJPEG_DIR)\.libs\libjpeg.a
       
   128 !! if defined(USEMINGW32)
   127 !! if defined(USEMINGW32)
   129 LIBJPEG_TARGET = i686-pc-mingw32
   128 LIBJPEG_TARGET = i686-pc-mingw32
   130 !! else 
   129 !! else 
   131 LIBJPEG_TARGET = x86_64-w64-mingw32
   130 LIBJPEG_TARGET = x86_64-w64-mingw32
   132 !! endif
   131 !! endif
       
   132 LIBJPEG=$(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\.libs\libjpeg.a
       
   133 CLOCAL_INCL=-I"$(LIBJPEG_DIR)" -I"$(LIBJPEG_DIR)\$(LIBJPEG_TARGET)"
   133 !!else
   134 !!else
   134 LIBJPEG=$(LIBJPEG_DIR)\$(OBJDIR)\libjpeg.lib
   135 LIBJPEG=$(LIBJPEG_DIR)\$(OBJDIR)\libjpeg.lib
       
   136 CLOCAL_INCL=-I"$(LIBJPEG_DIR)"
   135 !!endif
   137 !!endif
   136 
   138 
   137 CLOCAL_INCL=-I"$(LIBJPEG_DIR)"
   139 
   138 '
   140 '
   139 
   141 
   140     "Created: / 22-08-2006 / 23:58:05 / cg"
   142     "Created: / 22-08-2006 / 23:58:05 / cg"
       
   143     "Modified: / 23-01-2017 / 12:09:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
   141 !
   144 !
   142 
   145 
   143 additionalLinkLibraries_bc_dot_mak
   146 additionalLinkLibraries_bc_dot_mak
   144     ^ '$(LIBJPEG)'
   147     ^ '$(LIBJPEG)'
   145 !
   148 !
   149 !
   152 !
   150 
   153 
   151 additionalRules_bc_dot_mak
   154 additionalRules_bc_dot_mak
   152     ^ '
   155     ^ '
   153 !!if defined(USEMINGW32) || defined(USEMINGW64)
   156 !!if defined(USEMINGW32) || defined(USEMINGW64)
   154 $(LIBJPEG): $(LIBJPEG_DIR)/config.status
   157 $(LIBJPEG): $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/config.status
   155     pushd $(LIBJPEG_DIR) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make
   158     pushd $(LIBJPEG_DIR)\$(LIBJPEG_TARGET) & set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make
   156 
   159 
   157 $(LIBJPEG_DIR)/config.status:
   160 $(LIBJPEG_DIR)/$(LIBJPEG_TARGET)/config.status:
   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
   161     -md $(LIBJPEG_DIR)\$(LIBJPEG_TARGET)
       
   162     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)
   159 
   163 
   160 clobber::
   164 clobber::
   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)
   165     -rd /S /Q $(LIBJPEG_DIR)\$(LIBJPEG_TARGET)
   162 
   166 
   163 clean::
   167 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)
   168     -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)
       
   169 
       
   170 $(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\jconfig.h
       
   171 $(LIBJPEG_DIR)\$(LIBJPEG_TARGET)\jconfig.h: $(LIBJPEG)  
   165 
   172 
   166 !!else
   173 !!else
   167 $(LIBJPEG):
   174 $(LIBJPEG):
   168     cd $(LIBJPEG_DIR)
   175     cd $(LIBJPEG_DIR)
   169     $(MAKE_BAT)
   176     $(MAKE_BAT)
   170     cd ..\..\libview2
   177     cd ..\..\libview2
       
   178 $(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h
       
   179 $(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG)  
   171 !!endif
   180 !!endif
   172 
   181 
   173 $(OUTDIR)JPEGReader.$(O):: $(LIBJPEG_DIR)\jconfig.h
   182 
   174 
       
   175 $(LIBJPEG_DIR)\jconfig.h: $(LIBJPEG)
       
   176 '
   183 '
   177 
   184 
   178     "Created: / 22-08-2006 / 23:58:29 / cg"
   185     "Created: / 22-08-2006 / 23:58:29 / cg"
       
   186     "Modified: / 23-01-2017 / 12:19:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
   179 !
   187 !
   180 
   188 
   181 additionalRules_make_dot_proto
   189 additionalRules_make_dot_proto
   182     ^ '
   190     ^ '
   183 
   191 
   347         TriggerValue
   355         TriggerValue
   348         TypeConverter
   356         TypeConverter
   349         ValueHolderWithRememberedPreviousValue
   357         ValueHolderWithRememberedPreviousValue
   350         ValueHolderWithWeakDependents
   358         ValueHolderWithWeakDependents
   351         AspectAdaptorWithDefault
   359         AspectAdaptorWithDefault
       
   360         (Wrapper autoload)
       
   361         (TranslatingWrapper autoload)
       
   362         (LayoutWrapper autoload)
       
   363         (BoundedWrapper autoload)
   352         (AVIReader autoload)
   364         (AVIReader autoload)
   353         (ApplicationController autoload)
   365         (ApplicationController autoload)
   354         (BlitImageReader autoload)
   366         (BlitImageReader autoload)
   355         (BorderedWrapper autoload)
   367         (BorderedWrapper autoload)
   356         (BoundedWrapper autoload)
       
   357         (CompositePart autoload)
   368         (CompositePart autoload)
   358         (CompositeTransform autoload)
   369         (CompositeTransform autoload)
   359         (ConvertedValue autoload)
   370         (ConvertedValue autoload)
   360         (DependentPart autoload)
   371         (DependentPart autoload)
   361         (FLIReader autoload)
   372         (FLIReader autoload)
   362         (FaceReader autoload)
   373         (FaceReader autoload)
       
   374         (GeometricWrapper autoload)
       
   375         (StrokingOrFillingWrapper autoload)
   363         (FillingWrapper autoload)
   376         (FillingWrapper autoload)
   364         (GeometricWrapper autoload)
       
   365         (HersheyFont autoload)
   377         (HersheyFont autoload)
   366         (Insets autoload)
   378         (Insets autoload)
   367         (IrisRGBReader autoload)
   379         (IrisRGBReader autoload)
   368         (LayoutWrapper autoload)
       
   369         (MatrixTransform2x3 autoload)
   380         (MatrixTransform2x3 autoload)
   370         (PBMReader autoload)
   381         (PBMReader autoload)
   371         (PCXReader autoload)
   382         (PCXReader autoload)
   372         (PICTReader autoload)
   383         (PICTReader autoload)
   373         (PluggableView autoload)
   384         (PluggableView autoload)
   374         (RIFFReader autoload)
   385         (RIFFReader autoload)
   375         (ST80FormReader autoload)
   386         (ST80FormReader autoload)
   376         (StrokingOrFillingWrapper autoload)
       
   377         (StrokingWrapper autoload)
   387         (StrokingWrapper autoload)
   378         (SunRasterReader autoload)
   388         (SunRasterReader autoload)
   379         (TargaReader autoload)
   389         (TargaReader autoload)
   380         (TranslatingWrapper autoload)
       
   381         (ViewForwardingController autoload)
   390         (ViewForwardingController autoload)
   382         (Wrapper autoload)
       
   383         (XWDReader autoload)
   391         (XWDReader autoload)
   384     )
   392     )
       
   393 
       
   394     "Modified: / 23-01-2017 / 12:12:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
   385 !
   395 !
   386 
   396 
   387 extensionMethodNames
   397 extensionMethodNames
   388     "list class/selector pairs of extensions.
   398     "list class/selector pairs of extensions.
   389      A correponding method with real names must be present in my concrete subclasses"
   399      A correponding method with real names must be present in my concrete subclasses"
   429     ^ '$Header$'
   439     ^ '$Header$'
   430 !
   440 !
   431 
   441 
   432 version_CVS
   442 version_CVS
   433     ^ '$Header$'
   443     ^ '$Header$'
   434 ! !
   444 !
   435 
   445 
       
   446 version_HG
       
   447     ^ '$Changeset: <not expanded> $'
       
   448 ! !
       
   449