View | Details | Raw Unified | Return to bug 237584
Collapse All | Expand All

(-)Makefile (-2 / +2 lines)
Lines 27-34 Link Here
27 
		libtiff.so:graphics/tiff \
 27 
		libtiff.so:graphics/tiff \
28 
		libsodium.so:security/libsodium
 28 
		libsodium.so:security/libsodium
29 

          29
          

        

          
            

              30
              
USES=		compiler:c++11-lib desktop-file-utils dos2unix gmake iconv jpeg openal:al \


              30
              
USES=		compiler:c++11-lib desktop-file-utils dos2unix gl gmake gnome iconv \

            

            

              31
              
		pkgconfig python:2.7,build tar:xz


              31
              
		jpeg openal:al pkgconfig python:2.7,build sdl tar:xz

            

        

          32
          
USE_GNOME=	libxml2

          32
          
USE_GNOME=	libxml2

        

        

          33
          
USE_GL=		gl

          33
          
USE_GL=		gl

        

        

          34
          
USE_SDL=	sdl2

          34
          
USE_SDL=	sdl2

        



(-)files/patch-libraries_source_fcollada_src_Makefile
      (-2 / +2 lines)




  

    
      
            Lines 1-4
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- libraries/source/fcollada/src/Makefile.orig	2014-09-24 14:39:28 UTC


              1
              
--- libraries/source/fcollada/src/Makefile.orig	2019-04-26 13:27:39 UTC

            

        

          2
          
+++ libraries/source/fcollada/src/Makefile

          2
          
+++ libraries/source/fcollada/src/Makefile

        

        

          3
          
@@ -227,7 +227,7 @@ OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OB

          3
          
@@ -227,7 +227,7 @@ OBJECTS_ALL = $(OBJECTS_DEBUG) $(OBJECTS_RELEASE) $(OB

        

        

          4
          
 all: output/libFColladaSD.a output/libFColladaSR.a install

          4
          
 all: output/libFColladaSD.a output/libFColladaSR.a install

        

  

    
      
            Lines 5-11
          
      
      
        Link Here
      
    
  

        

          5
          
 

          5
          
 

        

        

          6
          
 output_dirs:

          6
          
 output_dirs:

        

        

          7
          
-	bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'

          7
          
-	bash -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'

        

          
            

              8
              
+	csh -c 'mkdir -p output/{debug,release,test}/{FCollada/{FCDocument,FMath,FUtils,FColladaTest/{FCTestAssetManagement,FCTestExportImport,FCTestXRef}},FColladaPlugins/FArchiveXML}'


              8
              
+	for x in debug release test; do for y in FCDocument FMath FUtils FColladaTest; do for z in FCTestAssetManagement FCTestExportImport FCTestXRef; do mkdir -p output/$$x/FCollada/$$y/$$z; done; done; mkdir -p output/$$x/FColladaPlugins/FArchiveXML; done

            

        

          9
          
 

          9
          
 

        

        

          10
          
 test: FCollada/FColladaTest/ output/FColladaTest

          10
          
 test: FCollada/FColladaTest/ output/FColladaTest

        

        

          11
          
 	( cd FCollada/FColladaTest/ ; ../../output/FColladaTest )

          11
          
 	( cd FCollada/FColladaTest/ ; ../../output/FColladaTest )

        






  

  Return to bug 237584