diff --git a/src/common/common.pro b/src/common/common.pro index b80ead683..d4e529780 100644 --- a/src/common/common.pro +++ b/src/common/common.pro @@ -3,9 +3,9 @@ GLEWDIR = ../external/glew-1.5.1 GLEWCODE = $$GLEWDIR/src/glew.c #CONFIG(debug,debug | release) { - win32-msvc2005:DESTDIR = ../meshlabdistrib - win32-msvc2008:DESTDIR = ../meshlabdistrib - win32-g++:DLLDESTDIR = ../meshlabdistrib + win32-msvc2005:DESTDIR = ../distrib + win32-msvc2008:DESTDIR = ../distrib + win32-g++:DLLDESTDIR = ../distrib #} #CONFIG(release,debug | release) { diff --git a/src/meshlabdistrib/plugins/U3D_OSX/IDTFConverter.out b/src/distrib/plugins/U3D_OSX/IDTFConverter.out similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/IDTFConverter.out rename to src/distrib/plugins/U3D_OSX/IDTFConverter.out diff --git a/src/meshlabdistrib/plugins/U3D_OSX/IDTFConverter.sh b/src/distrib/plugins/U3D_OSX/IDTFConverter.sh similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/IDTFConverter.sh rename to src/distrib/plugins/U3D_OSX/IDTFConverter.sh diff --git a/src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXExporting.dylib b/src/distrib/plugins/U3D_OSX/Plugins/IFXExporting.dylib similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXExporting.dylib rename to src/distrib/plugins/U3D_OSX/Plugins/IFXExporting.dylib diff --git a/src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXImporting.dylib b/src/distrib/plugins/U3D_OSX/Plugins/IFXImporting.dylib similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXImporting.dylib rename to src/distrib/plugins/U3D_OSX/Plugins/IFXImporting.dylib diff --git a/src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXRendering.dylib b/src/distrib/plugins/U3D_OSX/Plugins/IFXRendering.dylib similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXRendering.dylib rename to src/distrib/plugins/U3D_OSX/Plugins/IFXRendering.dylib diff --git a/src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXScheduling.dylib b/src/distrib/plugins/U3D_OSX/Plugins/IFXScheduling.dylib similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXScheduling.dylib rename to src/distrib/plugins/U3D_OSX/Plugins/IFXScheduling.dylib diff --git a/src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXTextureModifier.dylib b/src/distrib/plugins/U3D_OSX/Plugins/IFXTextureModifier.dylib similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/Plugins/IFXTextureModifier.dylib rename to src/distrib/plugins/U3D_OSX/Plugins/IFXTextureModifier.dylib diff --git a/src/meshlabdistrib/plugins/U3D_OSX/Plugins/libIFXExporting.so b/src/distrib/plugins/U3D_OSX/Plugins/libIFXExporting.so similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/Plugins/libIFXExporting.so rename to src/distrib/plugins/U3D_OSX/Plugins/libIFXExporting.so diff --git a/src/meshlabdistrib/plugins/U3D_OSX/libIFXCore.so b/src/distrib/plugins/U3D_OSX/libIFXCore.so similarity index 100% rename from src/meshlabdistrib/plugins/U3D_OSX/libIFXCore.so rename to src/distrib/plugins/U3D_OSX/libIFXCore.so diff --git a/src/meshlabdistrib/plugins/U3D_W32/IDTFConverter.exe b/src/distrib/plugins/U3D_W32/IDTFConverter.exe similarity index 100% rename from src/meshlabdistrib/plugins/U3D_W32/IDTFConverter.exe rename to src/distrib/plugins/U3D_W32/IDTFConverter.exe diff --git a/src/meshlabdistrib/plugins/U3D_W32/IFXCore.dll b/src/distrib/plugins/U3D_W32/IFXCore.dll similarity index 100% rename from src/meshlabdistrib/plugins/U3D_W32/IFXCore.dll rename to src/distrib/plugins/U3D_W32/IFXCore.dll diff --git a/src/meshlabdistrib/plugins/U3D_W32/License.txt b/src/distrib/plugins/U3D_W32/License.txt similarity index 100% rename from src/meshlabdistrib/plugins/U3D_W32/License.txt rename to src/distrib/plugins/U3D_W32/License.txt diff --git a/src/meshlabdistrib/plugins/U3D_W32/LicensesAdditional.txt b/src/distrib/plugins/U3D_W32/LicensesAdditional.txt similarity index 100% rename from src/meshlabdistrib/plugins/U3D_W32/LicensesAdditional.txt rename to src/distrib/plugins/U3D_W32/LicensesAdditional.txt diff --git a/src/meshlabdistrib/plugins/U3D_W32/Plugins/IFXExporting.dll b/src/distrib/plugins/U3D_W32/Plugins/IFXExporting.dll similarity index 100% rename from src/meshlabdistrib/plugins/U3D_W32/Plugins/IFXExporting.dll rename to src/distrib/plugins/U3D_W32/Plugins/IFXExporting.dll diff --git a/src/meshlabdistrib/plugins/U3D_W32/readme.txt b/src/distrib/plugins/U3D_W32/readme.txt similarity index 100% rename from src/meshlabdistrib/plugins/U3D_W32/readme.txt rename to src/distrib/plugins/U3D_W32/readme.txt diff --git a/src/meshlabdistrib/plugins/plugins.txt b/src/distrib/plugins/plugins.txt similarity index 100% rename from src/meshlabdistrib/plugins/plugins.txt rename to src/distrib/plugins/plugins.txt diff --git a/src/meshlabdistrib/sample/1cfcmodel21.pdb b/src/distrib/sample/1cfcmodel21.pdb similarity index 100% rename from src/meshlabdistrib/sample/1cfcmodel21.pdb rename to src/distrib/sample/1cfcmodel21.pdb diff --git a/src/meshlabdistrib/sample/1crn.pdb b/src/distrib/sample/1crn.pdb similarity index 100% rename from src/meshlabdistrib/sample/1crn.pdb rename to src/distrib/sample/1crn.pdb diff --git a/src/meshlabdistrib/sample/COLLADA_triangulate.dae b/src/distrib/sample/COLLADA_triangulate.dae similarity index 100% rename from src/meshlabdistrib/sample/COLLADA_triangulate.dae rename to src/distrib/sample/COLLADA_triangulate.dae diff --git a/src/meshlabdistrib/sample/Laurana50k.ply b/src/distrib/sample/Laurana50k.ply similarity index 100% rename from src/meshlabdistrib/sample/Laurana50k.ply rename to src/distrib/sample/Laurana50k.ply diff --git a/src/meshlabdistrib/sample/SaddleCos.3DS b/src/distrib/sample/SaddleCos.3DS similarity index 100% rename from src/meshlabdistrib/sample/SaddleCos.3DS rename to src/distrib/sample/SaddleCos.3DS diff --git a/src/meshlabdistrib/sample/Seymour_triangulate.dae b/src/distrib/sample/Seymour_triangulate.dae similarity index 100% rename from src/meshlabdistrib/sample/Seymour_triangulate.dae rename to src/distrib/sample/Seymour_triangulate.dae diff --git a/src/meshlabdistrib/sample/T.ply b/src/distrib/sample/T.ply similarity index 100% rename from src/meshlabdistrib/sample/T.ply rename to src/distrib/sample/T.ply diff --git a/src/meshlabdistrib/sample/TextureDouble.ply b/src/distrib/sample/TextureDouble.ply similarity index 100% rename from src/meshlabdistrib/sample/TextureDouble.ply rename to src/distrib/sample/TextureDouble.ply diff --git a/src/meshlabdistrib/sample/TextureDouble_A.png b/src/distrib/sample/TextureDouble_A.png similarity index 100% rename from src/meshlabdistrib/sample/TextureDouble_A.png rename to src/distrib/sample/TextureDouble_A.png diff --git a/src/meshlabdistrib/sample/TextureDouble_B.png b/src/distrib/sample/TextureDouble_B.png similarity index 100% rename from src/meshlabdistrib/sample/TextureDouble_B.png rename to src/distrib/sample/TextureDouble_B.png diff --git a/src/meshlabdistrib/sample/block.off b/src/distrib/sample/block.off similarity index 100% rename from src/meshlabdistrib/sample/block.off rename to src/distrib/sample/block.off diff --git a/src/meshlabdistrib/sample/brain.ply b/src/distrib/sample/brain.ply similarity index 100% rename from src/meshlabdistrib/sample/brain.ply rename to src/distrib/sample/brain.ply diff --git a/src/meshlabdistrib/sample/bunny10k.obj b/src/distrib/sample/bunny10k.obj similarity index 100% rename from src/meshlabdistrib/sample/bunny10k.obj rename to src/distrib/sample/bunny10k.obj diff --git a/src/meshlabdistrib/sample/bunny10k.ply b/src/distrib/sample/bunny10k.ply similarity index 100% rename from src/meshlabdistrib/sample/bunny10k.ply rename to src/distrib/sample/bunny10k.ply diff --git a/src/meshlabdistrib/sample/bunny10k_textured.3ds b/src/distrib/sample/bunny10k_textured.3ds similarity index 100% rename from src/meshlabdistrib/sample/bunny10k_textured.3ds rename to src/distrib/sample/bunny10k_textured.3ds diff --git a/src/meshlabdistrib/sample/bunny10k_textured.mtl b/src/distrib/sample/bunny10k_textured.mtl similarity index 100% rename from src/meshlabdistrib/sample/bunny10k_textured.mtl rename to src/distrib/sample/bunny10k_textured.mtl diff --git a/src/meshlabdistrib/sample/bunny10k_textured.obj b/src/distrib/sample/bunny10k_textured.obj similarity index 100% rename from src/meshlabdistrib/sample/bunny10k_textured.obj rename to src/distrib/sample/bunny10k_textured.obj diff --git a/src/meshlabdistrib/sample/bunny16k.pts b/src/distrib/sample/bunny16k.pts similarity index 100% rename from src/meshlabdistrib/sample/bunny16k.pts rename to src/distrib/sample/bunny16k.pts diff --git a/src/meshlabdistrib/sample/bunny2.ply b/src/distrib/sample/bunny2.ply similarity index 100% rename from src/meshlabdistrib/sample/bunny2.ply rename to src/distrib/sample/bunny2.ply diff --git a/src/meshlabdistrib/sample/bunny70k.ply b/src/distrib/sample/bunny70k.ply similarity index 100% rename from src/meshlabdistrib/sample/bunny70k.ply rename to src/distrib/sample/bunny70k.ply diff --git a/src/meshlabdistrib/sample/casting.off b/src/distrib/sample/casting.off similarity index 100% rename from src/meshlabdistrib/sample/casting.off rename to src/distrib/sample/casting.off diff --git a/src/meshlabdistrib/sample/chameleon4k.pts b/src/distrib/sample/chameleon4k.pts similarity index 100% rename from src/meshlabdistrib/sample/chameleon4k.pts rename to src/distrib/sample/chameleon4k.pts diff --git a/src/meshlabdistrib/sample/conrod.stl b/src/distrib/sample/conrod.stl similarity index 100% rename from src/meshlabdistrib/sample/conrod.stl rename to src/distrib/sample/conrod.stl diff --git a/src/meshlabdistrib/sample/cube_triangulate.dae b/src/distrib/sample/cube_triangulate.dae similarity index 100% rename from src/meshlabdistrib/sample/cube_triangulate.dae rename to src/distrib/sample/cube_triangulate.dae diff --git a/src/meshlabdistrib/sample/duck_triangulate.dae b/src/distrib/sample/duck_triangulate.dae similarity index 100% rename from src/meshlabdistrib/sample/duck_triangulate.dae rename to src/distrib/sample/duck_triangulate.dae diff --git a/src/meshlabdistrib/sample/elephant.ply b/src/distrib/sample/elephant.ply similarity index 100% rename from src/meshlabdistrib/sample/elephant.ply rename to src/distrib/sample/elephant.ply diff --git a/src/meshlabdistrib/sample/greek_helmet.obj b/src/distrib/sample/greek_helmet.obj similarity index 100% rename from src/meshlabdistrib/sample/greek_helmet.obj rename to src/distrib/sample/greek_helmet.obj diff --git a/src/meshlabdistrib/sample/hippo.ply b/src/distrib/sample/hippo.ply similarity index 100% rename from src/meshlabdistrib/sample/hippo.ply rename to src/distrib/sample/hippo.ply diff --git a/src/meshlabdistrib/sample/images/boy_10.jpg b/src/distrib/sample/images/boy_10.jpg similarity index 100% rename from src/meshlabdistrib/sample/images/boy_10.jpg rename to src/distrib/sample/images/boy_10.jpg diff --git a/src/meshlabdistrib/sample/images/duckCM.jpg b/src/distrib/sample/images/duckCM.jpg similarity index 100% rename from src/meshlabdistrib/sample/images/duckCM.jpg rename to src/distrib/sample/images/duckCM.jpg diff --git a/src/meshlabdistrib/sample/images/mushroom.jpg b/src/distrib/sample/images/mushroom.jpg similarity index 100% rename from src/meshlabdistrib/sample/images/mushroom.jpg rename to src/distrib/sample/images/mushroom.jpg diff --git a/src/meshlabdistrib/sample/images/planeDiffuse.jpg b/src/distrib/sample/images/planeDiffuse.jpg similarity index 100% rename from src/meshlabdistrib/sample/images/planeDiffuse.jpg rename to src/distrib/sample/images/planeDiffuse.jpg diff --git a/src/meshlabdistrib/sample/knot_max_simplified.STL b/src/distrib/sample/knot_max_simplified.STL similarity index 100% rename from src/meshlabdistrib/sample/knot_max_simplified.STL rename to src/distrib/sample/knot_max_simplified.STL diff --git a/src/meshlabdistrib/sample/many_small_holes.ply b/src/distrib/sample/many_small_holes.ply similarity index 100% rename from src/meshlabdistrib/sample/many_small_holes.ply rename to src/distrib/sample/many_small_holes.ply diff --git a/src/meshlabdistrib/sample/mushroom_wigglatexadescent.dae b/src/distrib/sample/mushroom_wigglatexadescent.dae similarity index 100% rename from src/meshlabdistrib/sample/mushroom_wigglatexadescent.dae rename to src/distrib/sample/mushroom_wigglatexadescent.dae diff --git a/src/meshlabdistrib/sample/noise.png b/src/distrib/sample/noise.png similarity index 100% rename from src/meshlabdistrib/sample/noise.png rename to src/distrib/sample/noise.png diff --git a/src/meshlabdistrib/sample/non_manif_hole.ply b/src/distrib/sample/non_manif_hole.ply similarity index 100% rename from src/meshlabdistrib/sample/non_manif_hole.ply rename to src/distrib/sample/non_manif_hole.ply diff --git a/src/meshlabdistrib/sample/normalmap/laurana500.ply b/src/distrib/sample/normalmap/laurana500.ply similarity index 100% rename from src/meshlabdistrib/sample/normalmap/laurana500.ply rename to src/distrib/sample/normalmap/laurana500.ply diff --git a/src/meshlabdistrib/sample/normalmap/laurana500.png b/src/distrib/sample/normalmap/laurana500.png similarity index 100% rename from src/meshlabdistrib/sample/normalmap/laurana500.png rename to src/distrib/sample/normalmap/laurana500.png diff --git a/src/meshlabdistrib/sample/normalmap/matteonormb.ply b/src/distrib/sample/normalmap/matteonormb.ply similarity index 100% rename from src/meshlabdistrib/sample/normalmap/matteonormb.ply rename to src/distrib/sample/normalmap/matteonormb.ply diff --git a/src/meshlabdistrib/sample/normalmap/matteonormb.png b/src/distrib/sample/normalmap/matteonormb.png similarity index 100% rename from src/meshlabdistrib/sample/normalmap/matteonormb.png rename to src/distrib/sample/normalmap/matteonormb.png diff --git a/src/meshlabdistrib/sample/normalmap/uccello200.ply b/src/distrib/sample/normalmap/uccello200.ply similarity index 100% rename from src/meshlabdistrib/sample/normalmap/uccello200.ply rename to src/distrib/sample/normalmap/uccello200.ply diff --git a/src/meshlabdistrib/sample/normalmap/uccello200.png b/src/distrib/sample/normalmap/uccello200.png similarity index 100% rename from src/meshlabdistrib/sample/normalmap/uccello200.png rename to src/distrib/sample/normalmap/uccello200.png diff --git a/src/meshlabdistrib/sample/office_chair.obj b/src/distrib/sample/office_chair.obj similarity index 100% rename from src/meshlabdistrib/sample/office_chair.obj rename to src/distrib/sample/office_chair.obj diff --git a/src/meshlabdistrib/sample/radio.3ds b/src/distrib/sample/radio.3ds similarity index 100% rename from src/meshlabdistrib/sample/radio.3ds rename to src/distrib/sample/radio.3ds diff --git a/src/meshlabdistrib/sample/radio_t.jpg b/src/distrib/sample/radio_t.jpg similarity index 100% rename from src/meshlabdistrib/sample/radio_t.jpg rename to src/distrib/sample/radio_t.jpg diff --git a/src/meshlabdistrib/sample/readme.txt b/src/distrib/sample/readme.txt similarity index 100% rename from src/meshlabdistrib/sample/readme.txt rename to src/distrib/sample/readme.txt diff --git a/src/meshlabdistrib/sample/saddle2.mtl b/src/distrib/sample/saddle2.mtl similarity index 100% rename from src/meshlabdistrib/sample/saddle2.mtl rename to src/distrib/sample/saddle2.mtl diff --git a/src/meshlabdistrib/sample/saddle2.obj b/src/distrib/sample/saddle2.obj similarity index 100% rename from src/meshlabdistrib/sample/saddle2.obj rename to src/distrib/sample/saddle2.obj diff --git a/src/meshlabdistrib/sample/screwdriver.ply b/src/distrib/sample/screwdriver.ply similarity index 100% rename from src/meshlabdistrib/sample/screwdriver.ply rename to src/distrib/sample/screwdriver.ply diff --git a/src/meshlabdistrib/sample/seashell.gts b/src/distrib/sample/seashell.gts similarity index 100% rename from src/meshlabdistrib/sample/seashell.gts rename to src/distrib/sample/seashell.gts diff --git a/src/meshlabdistrib/sample/seymourplane_triangulate.dae b/src/distrib/sample/seymourplane_triangulate.dae similarity index 100% rename from src/meshlabdistrib/sample/seymourplane_triangulate.dae rename to src/distrib/sample/seymourplane_triangulate.dae diff --git a/src/meshlabdistrib/sample/sharp_sphere.off b/src/distrib/sample/sharp_sphere.off similarity index 100% rename from src/meshlabdistrib/sample/sharp_sphere.off rename to src/distrib/sample/sharp_sphere.off diff --git a/src/meshlabdistrib/sample/sp.3ds b/src/distrib/sample/sp.3ds similarity index 100% rename from src/meshlabdistrib/sample/sp.3ds rename to src/distrib/sample/sp.3ds diff --git a/src/meshlabdistrib/sample/sp.JPG b/src/distrib/sample/sp.JPG similarity index 100% rename from src/meshlabdistrib/sample/sp.JPG rename to src/distrib/sample/sp.JPG diff --git a/src/meshlabdistrib/sample/sub.mtl b/src/distrib/sample/sub.mtl similarity index 100% rename from src/meshlabdistrib/sample/sub.mtl rename to src/distrib/sample/sub.mtl diff --git a/src/meshlabdistrib/sample/sub.obj b/src/distrib/sample/sub.obj similarity index 100% rename from src/meshlabdistrib/sample/sub.obj rename to src/distrib/sample/sub.obj diff --git a/src/meshlabdistrib/sample/sub_texture.jpg b/src/distrib/sample/sub_texture.jpg similarity index 100% rename from src/meshlabdistrib/sample/sub_texture.jpg rename to src/distrib/sample/sub_texture.jpg diff --git a/src/meshlabdistrib/sample/texturedknot.mtl b/src/distrib/sample/texturedknot.mtl similarity index 100% rename from src/meshlabdistrib/sample/texturedknot.mtl rename to src/distrib/sample/texturedknot.mtl diff --git a/src/meshlabdistrib/sample/texturedknot.obj b/src/distrib/sample/texturedknot.obj similarity index 100% rename from src/meshlabdistrib/sample/texturedknot.obj rename to src/distrib/sample/texturedknot.obj diff --git a/src/meshlabdistrib/sample/texturedknot.ply b/src/distrib/sample/texturedknot.ply similarity index 100% rename from src/meshlabdistrib/sample/texturedknot.ply rename to src/distrib/sample/texturedknot.ply diff --git a/src/meshlabdistrib/sample/trim-star.off b/src/distrib/sample/trim-star.off similarity index 100% rename from src/meshlabdistrib/sample/trim-star.off rename to src/distrib/sample/trim-star.off diff --git a/src/meshlabdistrib/sample/twirl.off b/src/distrib/sample/twirl.off similarity index 100% rename from src/meshlabdistrib/sample/twirl.off rename to src/distrib/sample/twirl.off diff --git a/src/meshlabdistrib/sample/u3d/ifdraft.sty b/src/distrib/sample/u3d/ifdraft.sty similarity index 100% rename from src/meshlabdistrib/sample/u3d/ifdraft.sty rename to src/distrib/sample/u3d/ifdraft.sty diff --git a/src/meshlabdistrib/sample/u3d/movie15.sty b/src/distrib/sample/u3d/movie15.sty similarity index 100% rename from src/meshlabdistrib/sample/u3d/movie15.sty rename to src/distrib/sample/u3d/movie15.sty diff --git a/src/meshlabdistrib/shaders/3Dlabs-license.txt b/src/distrib/shaders/3Dlabs-license.txt similarity index 100% rename from src/meshlabdistrib/shaders/3Dlabs-license.txt rename to src/distrib/shaders/3Dlabs-license.txt diff --git a/src/meshlabdistrib/shaders/Cook-Torrance.frag b/src/distrib/shaders/Cook-Torrance.frag similarity index 100% rename from src/meshlabdistrib/shaders/Cook-Torrance.frag rename to src/distrib/shaders/Cook-Torrance.frag diff --git a/src/meshlabdistrib/shaders/Cook-Torrance.gdp b/src/distrib/shaders/Cook-Torrance.gdp similarity index 100% rename from src/meshlabdistrib/shaders/Cook-Torrance.gdp rename to src/distrib/shaders/Cook-Torrance.gdp diff --git a/src/meshlabdistrib/shaders/Cook-Torrance.vert b/src/distrib/shaders/Cook-Torrance.vert similarity index 100% rename from src/meshlabdistrib/shaders/Cook-Torrance.vert rename to src/distrib/shaders/Cook-Torrance.vert diff --git a/src/meshlabdistrib/shaders/Hatch.frag b/src/distrib/shaders/Hatch.frag similarity index 100% rename from src/meshlabdistrib/shaders/Hatch.frag rename to src/distrib/shaders/Hatch.frag diff --git a/src/meshlabdistrib/shaders/Hatch.gdp b/src/distrib/shaders/Hatch.gdp similarity index 100% rename from src/meshlabdistrib/shaders/Hatch.gdp rename to src/distrib/shaders/Hatch.gdp diff --git a/src/meshlabdistrib/shaders/Hatch.vert b/src/distrib/shaders/Hatch.vert similarity index 100% rename from src/meshlabdistrib/shaders/Hatch.vert rename to src/distrib/shaders/Hatch.vert diff --git a/src/meshlabdistrib/shaders/LightworkDesign-license.txt b/src/distrib/shaders/LightworkDesign-license.txt similarity index 100% rename from src/meshlabdistrib/shaders/LightworkDesign-license.txt rename to src/distrib/shaders/LightworkDesign-license.txt diff --git a/src/meshlabdistrib/shaders/Oren-Nayar.frag b/src/distrib/shaders/Oren-Nayar.frag similarity index 100% rename from src/meshlabdistrib/shaders/Oren-Nayar.frag rename to src/distrib/shaders/Oren-Nayar.frag diff --git a/src/meshlabdistrib/shaders/Oren-Nayar.gdp b/src/distrib/shaders/Oren-Nayar.gdp similarity index 100% rename from src/meshlabdistrib/shaders/Oren-Nayar.gdp rename to src/distrib/shaders/Oren-Nayar.gdp diff --git a/src/meshlabdistrib/shaders/Oren-Nayar.vert b/src/distrib/shaders/Oren-Nayar.vert similarity index 100% rename from src/meshlabdistrib/shaders/Oren-Nayar.vert rename to src/distrib/shaders/Oren-Nayar.vert diff --git a/src/meshlabdistrib/shaders/SEM.frag b/src/distrib/shaders/SEM.frag similarity index 100% rename from src/meshlabdistrib/shaders/SEM.frag rename to src/distrib/shaders/SEM.frag diff --git a/src/meshlabdistrib/shaders/SEM.vert b/src/distrib/shaders/SEM.vert similarity index 100% rename from src/meshlabdistrib/shaders/SEM.vert rename to src/distrib/shaders/SEM.vert diff --git a/src/meshlabdistrib/shaders/ambient_occlusion.vert b/src/distrib/shaders/ambient_occlusion.vert similarity index 100% rename from src/meshlabdistrib/shaders/ambient_occlusion.vert rename to src/distrib/shaders/ambient_occlusion.vert diff --git a/src/meshlabdistrib/shaders/ambient_occlusion4.frag b/src/distrib/shaders/ambient_occlusion4.frag similarity index 100% rename from src/meshlabdistrib/shaders/ambient_occlusion4.frag rename to src/distrib/shaders/ambient_occlusion4.frag diff --git a/src/meshlabdistrib/shaders/ambient_occlusion8.frag b/src/distrib/shaders/ambient_occlusion8.frag similarity index 100% rename from src/meshlabdistrib/shaders/ambient_occlusion8.frag rename to src/distrib/shaders/ambient_occlusion8.frag diff --git a/src/meshlabdistrib/shaders/depthmap.frag b/src/distrib/shaders/depthmap.frag similarity index 100% rename from src/meshlabdistrib/shaders/depthmap.frag rename to src/distrib/shaders/depthmap.frag diff --git a/src/meshlabdistrib/shaders/depthmap.gdp b/src/distrib/shaders/depthmap.gdp similarity index 100% rename from src/meshlabdistrib/shaders/depthmap.gdp rename to src/distrib/shaders/depthmap.gdp diff --git a/src/meshlabdistrib/shaders/depthmap.vert b/src/distrib/shaders/depthmap.vert similarity index 100% rename from src/meshlabdistrib/shaders/depthmap.vert rename to src/distrib/shaders/depthmap.vert diff --git a/src/meshlabdistrib/shaders/dimple.frag b/src/distrib/shaders/dimple.frag similarity index 100% rename from src/meshlabdistrib/shaders/dimple.frag rename to src/distrib/shaders/dimple.frag diff --git a/src/meshlabdistrib/shaders/dimple.gdp b/src/distrib/shaders/dimple.gdp similarity index 100% rename from src/meshlabdistrib/shaders/dimple.gdp rename to src/distrib/shaders/dimple.gdp diff --git a/src/meshlabdistrib/shaders/dimple.vert b/src/distrib/shaders/dimple.vert similarity index 100% rename from src/meshlabdistrib/shaders/dimple.vert rename to src/distrib/shaders/dimple.vert diff --git a/src/meshlabdistrib/shaders/electronic microscope.gdp b/src/distrib/shaders/electronic microscope.gdp similarity index 100% rename from src/meshlabdistrib/shaders/electronic microscope.gdp rename to src/distrib/shaders/electronic microscope.gdp diff --git a/src/meshlabdistrib/shaders/envmap.frag b/src/distrib/shaders/envmap.frag similarity index 100% rename from src/meshlabdistrib/shaders/envmap.frag rename to src/distrib/shaders/envmap.frag diff --git a/src/meshlabdistrib/shaders/envmap.gdp b/src/distrib/shaders/envmap.gdp similarity index 100% rename from src/meshlabdistrib/shaders/envmap.gdp rename to src/distrib/shaders/envmap.gdp diff --git a/src/meshlabdistrib/shaders/envmap.vert b/src/distrib/shaders/envmap.vert similarity index 100% rename from src/meshlabdistrib/shaders/envmap.vert rename to src/distrib/shaders/envmap.vert diff --git a/src/meshlabdistrib/shaders/glass.frag b/src/distrib/shaders/glass.frag similarity index 100% rename from src/meshlabdistrib/shaders/glass.frag rename to src/distrib/shaders/glass.frag diff --git a/src/meshlabdistrib/shaders/glass.gdp b/src/distrib/shaders/glass.gdp similarity index 100% rename from src/meshlabdistrib/shaders/glass.gdp rename to src/distrib/shaders/glass.gdp diff --git a/src/meshlabdistrib/shaders/glass.vert b/src/distrib/shaders/glass.vert similarity index 100% rename from src/meshlabdistrib/shaders/glass.vert rename to src/distrib/shaders/glass.vert diff --git a/src/meshlabdistrib/shaders/gooch.frag b/src/distrib/shaders/gooch.frag similarity index 100% rename from src/meshlabdistrib/shaders/gooch.frag rename to src/distrib/shaders/gooch.frag diff --git a/src/meshlabdistrib/shaders/gooch.gdp b/src/distrib/shaders/gooch.gdp similarity index 100% rename from src/meshlabdistrib/shaders/gooch.gdp rename to src/distrib/shaders/gooch.gdp diff --git a/src/meshlabdistrib/shaders/gooch.vert b/src/distrib/shaders/gooch.vert similarity index 100% rename from src/meshlabdistrib/shaders/gooch.vert rename to src/distrib/shaders/gooch.vert diff --git a/src/meshlabdistrib/shaders/lattice.frag b/src/distrib/shaders/lattice.frag similarity index 100% rename from src/meshlabdistrib/shaders/lattice.frag rename to src/distrib/shaders/lattice.frag diff --git a/src/meshlabdistrib/shaders/lattice.gdp b/src/distrib/shaders/lattice.gdp similarity index 100% rename from src/meshlabdistrib/shaders/lattice.gdp rename to src/distrib/shaders/lattice.gdp diff --git a/src/meshlabdistrib/shaders/lattice.vert b/src/distrib/shaders/lattice.vert similarity index 100% rename from src/meshlabdistrib/shaders/lattice.vert rename to src/distrib/shaders/lattice.vert diff --git a/src/meshlabdistrib/shaders/minnaert.frag b/src/distrib/shaders/minnaert.frag similarity index 100% rename from src/meshlabdistrib/shaders/minnaert.frag rename to src/distrib/shaders/minnaert.frag diff --git a/src/meshlabdistrib/shaders/minnaert.gdp b/src/distrib/shaders/minnaert.gdp similarity index 100% rename from src/meshlabdistrib/shaders/minnaert.gdp rename to src/distrib/shaders/minnaert.gdp diff --git a/src/meshlabdistrib/shaders/minnaert.vert b/src/distrib/shaders/minnaert.vert similarity index 100% rename from src/meshlabdistrib/shaders/minnaert.vert rename to src/distrib/shaders/minnaert.vert diff --git a/src/meshlabdistrib/shaders/normalmap.frag b/src/distrib/shaders/normalmap.frag similarity index 100% rename from src/meshlabdistrib/shaders/normalmap.frag rename to src/distrib/shaders/normalmap.frag diff --git a/src/meshlabdistrib/shaders/normalmap.gdp b/src/distrib/shaders/normalmap.gdp similarity index 100% rename from src/meshlabdistrib/shaders/normalmap.gdp rename to src/distrib/shaders/normalmap.gdp diff --git a/src/meshlabdistrib/shaders/normalmap.vert b/src/distrib/shaders/normalmap.vert similarity index 100% rename from src/meshlabdistrib/shaders/normalmap.vert rename to src/distrib/shaders/normalmap.vert diff --git a/src/meshlabdistrib/shaders/phong.frag b/src/distrib/shaders/phong.frag similarity index 100% rename from src/meshlabdistrib/shaders/phong.frag rename to src/distrib/shaders/phong.frag diff --git a/src/meshlabdistrib/shaders/phong.gdp b/src/distrib/shaders/phong.gdp similarity index 100% rename from src/meshlabdistrib/shaders/phong.gdp rename to src/distrib/shaders/phong.gdp diff --git a/src/meshlabdistrib/shaders/phong.vert b/src/distrib/shaders/phong.vert similarity index 100% rename from src/meshlabdistrib/shaders/phong.vert rename to src/distrib/shaders/phong.vert diff --git a/src/meshlabdistrib/shaders/polkadot3d.frag b/src/distrib/shaders/polkadot3d.frag similarity index 100% rename from src/meshlabdistrib/shaders/polkadot3d.frag rename to src/distrib/shaders/polkadot3d.frag diff --git a/src/meshlabdistrib/shaders/polkadot3d.gdp b/src/distrib/shaders/polkadot3d.gdp similarity index 100% rename from src/meshlabdistrib/shaders/polkadot3d.gdp rename to src/distrib/shaders/polkadot3d.gdp diff --git a/src/meshlabdistrib/shaders/polkadot3d.vert b/src/distrib/shaders/polkadot3d.vert similarity index 100% rename from src/meshlabdistrib/shaders/polkadot3d.vert rename to src/distrib/shaders/polkadot3d.vert diff --git a/src/meshlabdistrib/shaders/reflexion_lines.frag b/src/distrib/shaders/reflexion_lines.frag similarity index 100% rename from src/meshlabdistrib/shaders/reflexion_lines.frag rename to src/distrib/shaders/reflexion_lines.frag diff --git a/src/meshlabdistrib/shaders/reflexion_lines.gdp b/src/distrib/shaders/reflexion_lines.gdp similarity index 100% rename from src/meshlabdistrib/shaders/reflexion_lines.gdp rename to src/distrib/shaders/reflexion_lines.gdp diff --git a/src/meshlabdistrib/shaders/reflexion_lines.vert b/src/distrib/shaders/reflexion_lines.vert similarity index 100% rename from src/meshlabdistrib/shaders/reflexion_lines.vert rename to src/distrib/shaders/reflexion_lines.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_analysis.frag b/src/distrib/shaders/splatpyramid/shader_analysis.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_analysis.frag rename to src/distrib/shaders/splatpyramid/shader_analysis.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_analysis.vert b/src/distrib/shaders/splatpyramid/shader_analysis.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_analysis.vert rename to src/distrib/shaders/splatpyramid/shader_analysis.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_analysis_color.frag b/src/distrib/shaders/splatpyramid/shader_analysis_color.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_analysis_color.frag rename to src/distrib/shaders/splatpyramid/shader_analysis_color.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_analysis_color.vert b/src/distrib/shaders/splatpyramid/shader_analysis_color.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_analysis_color.vert rename to src/distrib/shaders/splatpyramid/shader_analysis_color.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_copy.frag b/src/distrib/shaders/splatpyramid/shader_copy.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_copy.frag rename to src/distrib/shaders/splatpyramid/shader_copy.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_copy.vert b/src/distrib/shaders/splatpyramid/shader_copy.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_copy.vert rename to src/distrib/shaders/splatpyramid/shader_copy.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_copy_color.frag b/src/distrib/shaders/splatpyramid/shader_copy_color.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_copy_color.frag rename to src/distrib/shaders/splatpyramid/shader_copy_color.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_copy_color.vert b/src/distrib/shaders/splatpyramid/shader_copy_color.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_copy_color.vert rename to src/distrib/shaders/splatpyramid/shader_copy_color.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_phong.frag b/src/distrib/shaders/splatpyramid/shader_phong.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_phong.frag rename to src/distrib/shaders/splatpyramid/shader_phong.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_phong.vert b/src/distrib/shaders/splatpyramid/shader_phong.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_phong.vert rename to src/distrib/shaders/splatpyramid/shader_phong.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_phong_color.frag b/src/distrib/shaders/splatpyramid/shader_phong_color.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_phong_color.frag rename to src/distrib/shaders/splatpyramid/shader_phong_color.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_phong_color.vert b/src/distrib/shaders/splatpyramid/shader_phong_color.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_phong_color.vert rename to src/distrib/shaders/splatpyramid/shader_phong_color.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_point_projection.frag b/src/distrib/shaders/splatpyramid/shader_point_projection.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_point_projection.frag rename to src/distrib/shaders/splatpyramid/shader_point_projection.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_point_projection.vert b/src/distrib/shaders/splatpyramid/shader_point_projection.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_point_projection.vert rename to src/distrib/shaders/splatpyramid/shader_point_projection.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_point_projection_color.frag b/src/distrib/shaders/splatpyramid/shader_point_projection_color.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_point_projection_color.frag rename to src/distrib/shaders/splatpyramid/shader_point_projection_color.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_point_projection_color.vert b/src/distrib/shaders/splatpyramid/shader_point_projection_color.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_point_projection_color.vert rename to src/distrib/shaders/splatpyramid/shader_point_projection_color.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_synthesis.frag b/src/distrib/shaders/splatpyramid/shader_synthesis.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_synthesis.frag rename to src/distrib/shaders/splatpyramid/shader_synthesis.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_synthesis.vert b/src/distrib/shaders/splatpyramid/shader_synthesis.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_synthesis.vert rename to src/distrib/shaders/splatpyramid/shader_synthesis.vert diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_synthesis_color.frag b/src/distrib/shaders/splatpyramid/shader_synthesis_color.frag similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_synthesis_color.frag rename to src/distrib/shaders/splatpyramid/shader_synthesis_color.frag diff --git a/src/meshlabdistrib/shaders/splatpyramid/shader_synthesis_color.vert b/src/distrib/shaders/splatpyramid/shader_synthesis_color.vert similarity index 100% rename from src/meshlabdistrib/shaders/splatpyramid/shader_synthesis_color.vert rename to src/distrib/shaders/splatpyramid/shader_synthesis_color.vert diff --git a/src/meshlabdistrib/shaders/stripes2.frag b/src/distrib/shaders/stripes2.frag similarity index 100% rename from src/meshlabdistrib/shaders/stripes2.frag rename to src/distrib/shaders/stripes2.frag diff --git a/src/meshlabdistrib/shaders/stripes2.gdp b/src/distrib/shaders/stripes2.gdp similarity index 100% rename from src/meshlabdistrib/shaders/stripes2.gdp rename to src/distrib/shaders/stripes2.gdp diff --git a/src/meshlabdistrib/shaders/stripes2.vert b/src/distrib/shaders/stripes2.vert similarity index 100% rename from src/meshlabdistrib/shaders/stripes2.vert rename to src/distrib/shaders/stripes2.vert diff --git a/src/meshlabdistrib/shaders/toon.frag b/src/distrib/shaders/toon.frag similarity index 100% rename from src/meshlabdistrib/shaders/toon.frag rename to src/distrib/shaders/toon.frag diff --git a/src/meshlabdistrib/shaders/toon.gdp b/src/distrib/shaders/toon.gdp similarity index 100% rename from src/meshlabdistrib/shaders/toon.gdp rename to src/distrib/shaders/toon.gdp diff --git a/src/meshlabdistrib/shaders/toon.vert b/src/distrib/shaders/toon.vert similarity index 100% rename from src/meshlabdistrib/shaders/toon.vert rename to src/distrib/shaders/toon.vert diff --git a/src/meshlabdistrib/shaders/xray.frag b/src/distrib/shaders/xray.frag similarity index 100% rename from src/meshlabdistrib/shaders/xray.frag rename to src/distrib/shaders/xray.frag diff --git a/src/meshlabdistrib/shaders/xray.gdp b/src/distrib/shaders/xray.gdp similarity index 100% rename from src/meshlabdistrib/shaders/xray.gdp rename to src/distrib/shaders/xray.gdp diff --git a/src/meshlabdistrib/shaders/xray.vert b/src/distrib/shaders/xray.vert similarity index 100% rename from src/meshlabdistrib/shaders/xray.vert rename to src/distrib/shaders/xray.vert diff --git a/src/meshlabdistrib/shadersrm/Depth of Field.rfx b/src/distrib/shadersrm/Depth of Field.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/Depth of Field.rfx rename to src/distrib/shadersrm/Depth of Field.rfx diff --git a/src/meshlabdistrib/shadersrm/GlyphBomb.rfx b/src/distrib/shadersrm/GlyphBomb.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/GlyphBomb.rfx rename to src/distrib/shadersrm/GlyphBomb.rfx diff --git a/src/meshlabdistrib/shadersrm/ImageBasedLighting.rfx b/src/distrib/shadersrm/ImageBasedLighting.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/ImageBasedLighting.rfx rename to src/distrib/shadersrm/ImageBasedLighting.rfx diff --git a/src/meshlabdistrib/shadersrm/NormalMapping.rfx b/src/distrib/shadersrm/NormalMapping.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/NormalMapping.rfx rename to src/distrib/shadersrm/NormalMapping.rfx diff --git a/src/meshlabdistrib/shadersrm/PhongUntextured.rfx b/src/distrib/shadersrm/PhongUntextured.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/PhongUntextured.rfx rename to src/distrib/shadersrm/PhongUntextured.rfx diff --git a/src/meshlabdistrib/shadersrm/Plastic.rfx b/src/distrib/shadersrm/Plastic.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/Plastic.rfx rename to src/distrib/shadersrm/Plastic.rfx diff --git a/src/meshlabdistrib/shadersrm/RenderToTexture.rfx b/src/distrib/shadersrm/RenderToTexture.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/RenderToTexture.rfx rename to src/distrib/shadersrm/RenderToTexture.rfx diff --git a/src/meshlabdistrib/shadersrm/ShadowMapping.rfx b/src/distrib/shadersrm/ShadowMapping.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/ShadowMapping.rfx rename to src/distrib/shadersrm/ShadowMapping.rfx diff --git a/src/meshlabdistrib/shadersrm/ZBrush.rfx b/src/distrib/shadersrm/ZBrush.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/ZBrush.rfx rename to src/distrib/shadersrm/ZBrush.rfx diff --git a/src/meshlabdistrib/shadersrm/cartoon.rfx b/src/distrib/shadersrm/cartoon.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/cartoon.rfx rename to src/distrib/shadersrm/cartoon.rfx diff --git a/src/meshlabdistrib/shadersrm/cubeenvmap.rfx b/src/distrib/shadersrm/cubeenvmap.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/cubeenvmap.rfx rename to src/distrib/shadersrm/cubeenvmap.rfx diff --git a/src/meshlabdistrib/shadersrm/fur.rfx b/src/distrib/shadersrm/fur.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/fur.rfx rename to src/distrib/shadersrm/fur.rfx diff --git a/src/meshlabdistrib/shadersrm/hatching.rfx b/src/distrib/shadersrm/hatching.rfx similarity index 100% rename from src/meshlabdistrib/shadersrm/hatching.rfx rename to src/distrib/shadersrm/hatching.rfx diff --git a/src/meshlabdistrib/textures/Fur.png b/src/distrib/textures/Fur.png similarity index 100% rename from src/meshlabdistrib/textures/Fur.png rename to src/distrib/textures/Fur.png diff --git a/src/meshlabdistrib/textures/NPR Metallic Outline.png b/src/distrib/textures/NPR Metallic Outline.png similarity index 100% rename from src/meshlabdistrib/textures/NPR Metallic Outline.png rename to src/distrib/textures/NPR Metallic Outline.png diff --git a/src/meshlabdistrib/textures/NPR Metallic Outline.tga b/src/distrib/textures/NPR Metallic Outline.tga similarity index 100% rename from src/meshlabdistrib/textures/NPR Metallic Outline.tga rename to src/distrib/textures/NPR Metallic Outline.tga diff --git a/src/meshlabdistrib/textures/OTS-DiffuseCubeMap.dds b/src/distrib/textures/OTS-DiffuseCubeMap.dds similarity index 100% rename from src/meshlabdistrib/textures/OTS-DiffuseCubeMap.dds rename to src/distrib/textures/OTS-DiffuseCubeMap.dds diff --git a/src/meshlabdistrib/textures/OTS-Phong50CubeMap.dds b/src/distrib/textures/OTS-Phong50CubeMap.dds similarity index 100% rename from src/meshlabdistrib/textures/OTS-Phong50CubeMap.dds rename to src/distrib/textures/OTS-Phong50CubeMap.dds diff --git a/src/meshlabdistrib/textures/base.tga b/src/distrib/textures/base.tga similarity index 100% rename from src/meshlabdistrib/textures/base.tga rename to src/distrib/textures/base.tga diff --git a/src/meshlabdistrib/textures/brickbump.jpg b/src/distrib/textures/brickbump.jpg similarity index 100% rename from src/meshlabdistrib/textures/brickbump.jpg rename to src/distrib/textures/brickbump.jpg diff --git a/src/meshlabdistrib/textures/brickbump.tga b/src/distrib/textures/brickbump.tga similarity index 100% rename from src/meshlabdistrib/textures/brickbump.tga rename to src/distrib/textures/brickbump.tga diff --git a/src/meshlabdistrib/textures/chrome.png b/src/distrib/textures/chrome.png similarity index 100% rename from src/meshlabdistrib/textures/chrome.png rename to src/distrib/textures/chrome.png diff --git a/src/meshlabdistrib/textures/cubemaps/forest/forest_negx.jpg b/src/distrib/textures/cubemaps/forest/forest_negx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/forest/forest_negx.jpg rename to src/distrib/textures/cubemaps/forest/forest_negx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/forest/forest_negy.jpg b/src/distrib/textures/cubemaps/forest/forest_negy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/forest/forest_negy.jpg rename to src/distrib/textures/cubemaps/forest/forest_negy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/forest/forest_negz.jpg b/src/distrib/textures/cubemaps/forest/forest_negz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/forest/forest_negz.jpg rename to src/distrib/textures/cubemaps/forest/forest_negz.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/forest/forest_posx.jpg b/src/distrib/textures/cubemaps/forest/forest_posx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/forest/forest_posx.jpg rename to src/distrib/textures/cubemaps/forest/forest_posx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/forest/forest_posy.jpg b/src/distrib/textures/cubemaps/forest/forest_posy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/forest/forest_posy.jpg rename to src/distrib/textures/cubemaps/forest/forest_posy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/forest/forest_posz.jpg b/src/distrib/textures/cubemaps/forest/forest_posz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/forest/forest_posz.jpg rename to src/distrib/textures/cubemaps/forest/forest_posz.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/forest/readme.txt b/src/distrib/textures/cubemaps/forest/readme.txt similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/forest/readme.txt rename to src/distrib/textures/cubemaps/forest/readme.txt diff --git a/src/meshlabdistrib/textures/cubemaps/mount_negx.jpg b/src/distrib/textures/cubemaps/mount_negx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/mount_negx.jpg rename to src/distrib/textures/cubemaps/mount_negx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/mount_negy.jpg b/src/distrib/textures/cubemaps/mount_negy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/mount_negy.jpg rename to src/distrib/textures/cubemaps/mount_negy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/mount_negz.jpg b/src/distrib/textures/cubemaps/mount_negz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/mount_negz.jpg rename to src/distrib/textures/cubemaps/mount_negz.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/mount_posx.jpg b/src/distrib/textures/cubemaps/mount_posx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/mount_posx.jpg rename to src/distrib/textures/cubemaps/mount_posx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/mount_posy.jpg b/src/distrib/textures/cubemaps/mount_posy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/mount_posy.jpg rename to src/distrib/textures/cubemaps/mount_posy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/mount_posz.jpg b/src/distrib/textures/cubemaps/mount_posz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/mount_posz.jpg rename to src/distrib/textures/cubemaps/mount_posz.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/sky_negx.jpg b/src/distrib/textures/cubemaps/sky_negx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/sky_negx.jpg rename to src/distrib/textures/cubemaps/sky_negx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/sky_negy.jpg b/src/distrib/textures/cubemaps/sky_negy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/sky_negy.jpg rename to src/distrib/textures/cubemaps/sky_negy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/sky_negz.jpg b/src/distrib/textures/cubemaps/sky_negz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/sky_negz.jpg rename to src/distrib/textures/cubemaps/sky_negz.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/sky_posx.jpg b/src/distrib/textures/cubemaps/sky_posx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/sky_posx.jpg rename to src/distrib/textures/cubemaps/sky_posx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/sky_posy.jpg b/src/distrib/textures/cubemaps/sky_posy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/sky_posy.jpg rename to src/distrib/textures/cubemaps/sky_posy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/sky_posz.jpg b/src/distrib/textures/cubemaps/sky_posz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/sky_posz.jpg rename to src/distrib/textures/cubemaps/sky_posz.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/uffizi_negx.jpg b/src/distrib/textures/cubemaps/uffizi_negx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/uffizi_negx.jpg rename to src/distrib/textures/cubemaps/uffizi_negx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/uffizi_negy.jpg b/src/distrib/textures/cubemaps/uffizi_negy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/uffizi_negy.jpg rename to src/distrib/textures/cubemaps/uffizi_negy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/uffizi_negz.jpg b/src/distrib/textures/cubemaps/uffizi_negz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/uffizi_negz.jpg rename to src/distrib/textures/cubemaps/uffizi_negz.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/uffizi_posx.jpg b/src/distrib/textures/cubemaps/uffizi_posx.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/uffizi_posx.jpg rename to src/distrib/textures/cubemaps/uffizi_posx.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/uffizi_posy.jpg b/src/distrib/textures/cubemaps/uffizi_posy.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/uffizi_posy.jpg rename to src/distrib/textures/cubemaps/uffizi_posy.jpg diff --git a/src/meshlabdistrib/textures/cubemaps/uffizi_posz.jpg b/src/distrib/textures/cubemaps/uffizi_posz.jpg similarity index 100% rename from src/meshlabdistrib/textures/cubemaps/uffizi_posz.jpg rename to src/distrib/textures/cubemaps/uffizi_posz.jpg diff --git a/src/meshlabdistrib/textures/envmap.svg b/src/distrib/textures/envmap.svg similarity index 100% rename from src/meshlabdistrib/textures/envmap.svg rename to src/distrib/textures/envmap.svg diff --git a/src/meshlabdistrib/textures/glyphmosaic.png b/src/distrib/textures/glyphmosaic.png similarity index 100% rename from src/meshlabdistrib/textures/glyphmosaic.png rename to src/distrib/textures/glyphmosaic.png diff --git a/src/meshlabdistrib/textures/hatch0.jpg b/src/distrib/textures/hatch0.jpg similarity index 100% rename from src/meshlabdistrib/textures/hatch0.jpg rename to src/distrib/textures/hatch0.jpg diff --git a/src/meshlabdistrib/textures/hatch1.jpg b/src/distrib/textures/hatch1.jpg similarity index 100% rename from src/meshlabdistrib/textures/hatch1.jpg rename to src/distrib/textures/hatch1.jpg diff --git a/src/meshlabdistrib/textures/hatch2.jpg b/src/distrib/textures/hatch2.jpg similarity index 100% rename from src/meshlabdistrib/textures/hatch2.jpg rename to src/distrib/textures/hatch2.jpg diff --git a/src/meshlabdistrib/textures/hatch3.jpg b/src/distrib/textures/hatch3.jpg similarity index 100% rename from src/meshlabdistrib/textures/hatch3.jpg rename to src/distrib/textures/hatch3.jpg diff --git a/src/meshlabdistrib/textures/hatch4.jpg b/src/distrib/textures/hatch4.jpg similarity index 100% rename from src/meshlabdistrib/textures/hatch4.jpg rename to src/distrib/textures/hatch4.jpg diff --git a/src/meshlabdistrib/textures/hatch5.jpg b/src/distrib/textures/hatch5.jpg similarity index 100% rename from src/meshlabdistrib/textures/hatch5.jpg rename to src/distrib/textures/hatch5.jpg diff --git a/src/meshlabdistrib/textures/rgbarand.dds b/src/distrib/textures/rgbarand.dds similarity index 100% rename from src/meshlabdistrib/textures/rgbarand.dds rename to src/distrib/textures/rgbarand.dds diff --git a/src/meshlabdistrib/textures/rockbump.jpg b/src/distrib/textures/rockbump.jpg similarity index 100% rename from src/meshlabdistrib/textures/rockbump.jpg rename to src/distrib/textures/rockbump.jpg diff --git a/src/meshlabdistrib/textures/rockbump.tga b/src/distrib/textures/rockbump.tga similarity index 100% rename from src/meshlabdistrib/textures/rockbump.tga rename to src/distrib/textures/rockbump.tga diff --git a/src/meshlabdistrib/textures/uffiziCubeMap.dds b/src/distrib/textures/uffiziCubeMap.dds similarity index 100% rename from src/meshlabdistrib/textures/uffiziCubeMap.dds rename to src/distrib/textures/uffiziCubeMap.dds diff --git a/src/meshlabdistrib/textures/wood.jpg b/src/distrib/textures/wood.jpg similarity index 100% rename from src/meshlabdistrib/textures/wood.jpg rename to src/distrib/textures/wood.jpg diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index 61405c560..58e22c1b2 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -1,7 +1,7 @@ VCGDIR = ../../../vcglib GLEWDIR = ../external/glew-1.5.1 #CONFIG += debug_and_release -DESTDIR = ../meshlabdistrib +DESTDIR = ../distrib # uncomment to try Eigen # DEFINES += VCG_USE_EIGEN # CONFIG += warn_off diff --git a/src/meshlabserver/meshlabserver.pro b/src/meshlabserver/meshlabserver.pro index 39e67ba1f..429fceae5 100644 --- a/src/meshlabserver/meshlabserver.pro +++ b/src/meshlabserver/meshlabserver.pro @@ -8,7 +8,7 @@ SOURCES = mainserver.cpp RC_FILE = ../meshlab/meshlab.rc QT += xml opengl -DESTDIR = ../meshlabdistrib +DESTDIR = ../distrib # the following line is needed to avoid mismatch between # the awful min/max macros of windows and the limits max diff --git a/src/shared.pri b/src/shared.pri index 1b3091a0e..7a1f1c51c 100644 --- a/src/shared.pri +++ b/src/shared.pri @@ -11,9 +11,9 @@ mac:LIBS += ../../common/libcommon.dylib #correct qmake syntax requires CONFIG(option, list of options) -win32-msvc2005: LIBS += ../../meshlabdistrib/common.lib -win32-msvc2008: LIBS += ../../meshlabdistrib/common.lib -win32-g++:LIBS += -L../../meshlabdistrib -lcommon +win32-msvc2005: LIBS += ../../distrib/common.lib +win32-msvc2008: LIBS += ../../distrib/common.lib +win32-g++:LIBS += -L../../distrib -lcommon #CONFIG(debug, debug|release) {