Merge branch 'refs/heads/master' into review-CL-Bundler
This commit is contained in:
jriegel
@@ -1,86 +0,0 @@
|
||||
|
||||
lib_LTLIBRARIES=libDrawing.la Drawing.la
|
||||
|
||||
libDrawing_la_SOURCES=\
|
||||
AppDrawingPy.cpp \
|
||||
DrawingExport.cpp \
|
||||
DrawingExport.h \
|
||||
FeaturePage.cpp \
|
||||
FeaturePage.h \
|
||||
FeatureProjection.cpp \
|
||||
FeatureProjection.h \
|
||||
FeatureView.cpp \
|
||||
FeatureView.h \
|
||||
FeatureViewPart.cpp \
|
||||
FeatureViewPart.h \
|
||||
FeatureViewAnnotation.cpp \
|
||||
FeatureViewAnnotation.h \
|
||||
FeatureClip.cpp \
|
||||
FeatureClip.h \
|
||||
PageGroup.cpp \
|
||||
PageGroup.h \
|
||||
ProjectionAlgos.cpp \
|
||||
ProjectionAlgos.h \
|
||||
PreCompiled.cpp \
|
||||
PreCompiled.h
|
||||
|
||||
|
||||
# the library search path.
|
||||
libDrawing_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Mod/Part/App \
|
||||
-L$(OCC_LIB) $(all_libraries) \
|
||||
-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
|
||||
libDrawing_la_CPPFLAGS = -DDrawingExport=
|
||||
|
||||
libDrawing_la_LIBADD = \
|
||||
@BOOST_REGEX_LIB@ @BOOST_SYSTEM_LIB@ \
|
||||
-l@PYTHON_LIB@ \
|
||||
-lxerces-c \
|
||||
-lFreeCADBase \
|
||||
-lFreeCADApp \
|
||||
-lPart \
|
||||
-lTKernel \
|
||||
-lTKG2d \
|
||||
-lTKG3d \
|
||||
-lTKMath \
|
||||
-lTKSTEP \
|
||||
-lTKIGES \
|
||||
-lTKSTL \
|
||||
-lTKShHealing \
|
||||
-lTKXSBase \
|
||||
-lTKBool \
|
||||
-lTKBO \
|
||||
-lTKBRep \
|
||||
-lTKTopAlgo \
|
||||
-lTKGeomAlgo \
|
||||
-lTKGeomBase \
|
||||
-lTKOffset \
|
||||
-lTKPrim \
|
||||
-lTKHLR \
|
||||
-lTKMesh
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
# Loader of libDrawing
|
||||
|
||||
Drawing_la_SOURCES=\
|
||||
AppDrawing.cpp
|
||||
|
||||
# the library search path.
|
||||
Drawing_la_LDFLAGS = $(libDrawing_la_LDFLAGS) -module -avoid-version
|
||||
Drawing_la_CPPFLAGS = $(libDrawing_la_CPPFLAGS)
|
||||
|
||||
Drawing_la_LIBADD = \
|
||||
$(libDrawing_la_LIBADD) \
|
||||
-lDrawing
|
||||
|
||||
Drawing_la_DEPENDENCIES = libDrawing.la
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
# set the include path found by configure
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(OCC_INC) $(all_includes)
|
||||
|
||||
|
||||
libdir = $(prefix)/Mod/Drawing
|
||||
|
||||
EXTRA_DIST = \
|
||||
CMakeLists.txt
|
||||
@@ -1,97 +0,0 @@
|
||||
SUBDIRS=Resources
|
||||
|
||||
lib_LTLIBRARIES=libDrawingGui.la DrawingGui.la
|
||||
|
||||
BUILT_SOURCES=\
|
||||
moc_DrawingView.cpp \
|
||||
moc_TaskOrthoViews.cpp \
|
||||
ui_TaskOrthoViews.h \
|
||||
moc_TaskDialog.cpp
|
||||
|
||||
libDrawingGui_la_UI=\
|
||||
TaskOrthoViews.ui
|
||||
|
||||
libDrawingGui_la_SOURCES=\
|
||||
AppDrawingGuiPy.cpp \
|
||||
Command.cpp \
|
||||
DrawingView.cpp \
|
||||
DrawingView.h \
|
||||
PreCompiled.cpp \
|
||||
PreCompiled.h \
|
||||
TaskDialog.cpp \
|
||||
TaskDialog.h \
|
||||
TaskOrthoViews.cpp \
|
||||
TaskOrthoViews.h \
|
||||
ViewProviderPage.cpp \
|
||||
ViewProviderPage.h \
|
||||
ViewProviderView.cpp \
|
||||
ViewProviderView.h \
|
||||
Workbench.cpp \
|
||||
Workbench.h
|
||||
|
||||
# the library search path.
|
||||
libDrawingGui_la_LDFLAGS = -L../../../Base -L../../../App -L../../../Gui -L../../Part/App -L../App \
|
||||
-L$(OCC_LIB) $(QT_LIBS) $(GL_LIBS) $(all_libraries) \
|
||||
-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
|
||||
libDrawingGui_la_CPPFLAGS = -DDrawingAppExport= -DDrawingGuiExport=
|
||||
|
||||
libDrawingGui_la_LIBADD = \
|
||||
@BOOST_SYSTEM_LIB@ \
|
||||
-l@PYTHON_LIB@ \
|
||||
-lxerces-c \
|
||||
-lTKernel \
|
||||
-lTKMath \
|
||||
-lFreeCADBase \
|
||||
-lFreeCADApp \
|
||||
-lFreeCADGui \
|
||||
-lPart \
|
||||
-lDrawing
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
# Loader of libDrawingGui
|
||||
|
||||
DrawingGui_la_SOURCES=\
|
||||
AppDrawingGui.cpp
|
||||
|
||||
# the library search path.
|
||||
DrawingGui_la_LDFLAGS = $(libDrawingGui_la_LDFLAGS) -module -avoid-version
|
||||
DrawingGui_la_CPPFLAGS = $(libDrawingGui_la_CPPFLAGS)
|
||||
|
||||
DrawingGui_la_LIBADD = \
|
||||
$(libDrawingGui_la_LIBADD) \
|
||||
Resources/libResources.la \
|
||||
-lDrawingGui
|
||||
|
||||
DrawingGui_la_DEPENDENCIES = libDrawingGui.la
|
||||
|
||||
#--------------------------------------------------------------------------------------
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
moc_%.cpp: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
%.moc: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rules for Qt User Interface Compiler:
|
||||
ui_%.h: %.ui
|
||||
$(QT_UIC) $< -o $(@F)
|
||||
|
||||
# rules for Qt Resource Compiler:
|
||||
qrc_%.cpp: %.qrc
|
||||
$(QT_RCC) -name $(*F) $< -o $(@F)
|
||||
|
||||
# set the include path found by configure
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) $(QT_CXXFLAGS) \
|
||||
-I$(sim_ac_coin_includedir) -I$(sim_ac_soqt_includedir) -I$(OCC_INC)
|
||||
|
||||
|
||||
libdir = $(prefix)/Mod/Drawing
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(libDrawingGui_la_UI) \
|
||||
CMakeLists.txt
|
||||
|
||||
@@ -1,92 +0,0 @@
|
||||
noinst_LTLIBRARIES=libResources.la
|
||||
|
||||
BUILT_SOURCES=\
|
||||
qrc_Drawing.cpp
|
||||
|
||||
nodist_libResources_la_SOURCES=\
|
||||
qrc_Drawing.cpp
|
||||
|
||||
EXTRA_DIST = \
|
||||
icons/actions/document-new.png \
|
||||
icons/actions/document-new.svg \
|
||||
icons/actions/drawing-landscape-A0.svg \
|
||||
icons/actions/drawing-landscape-A1.svg \
|
||||
icons/actions/drawing-landscape-A2.svg \
|
||||
icons/actions/drawing-landscape.svg \
|
||||
icons/actions/drawing-view.svg \
|
||||
icons/actions/drawing-landscape-A3.svg \
|
||||
icons/actions/drawing-landscape-A4.svg \
|
||||
icons/actions/drawing-landscape-new.svg \
|
||||
icons/actions/drawing-portrait-A4.svg \
|
||||
icons/actions/drawing-orthoviews.svg \
|
||||
icons/actions/drawing-openbrowser.svg \
|
||||
icons/actions/drawing-annotation.svg \
|
||||
icons/actions/drawing-clip.svg \
|
||||
icons/Page.svg \
|
||||
icons/Pages.svg \
|
||||
icons/View.svg \
|
||||
translations/Drawing_af.qm \
|
||||
translations/Drawing_de.qm \
|
||||
translations/Drawing_es-ES.qm \
|
||||
translations/Drawing_fi.qm \
|
||||
translations/Drawing_fr.qm \
|
||||
translations/Drawing_hr.qm \
|
||||
translations/Drawing_it.qm \
|
||||
translations/Drawing_nl.qm \
|
||||
translations/Drawing_no.qm \
|
||||
translations/Drawing_pl.qm \
|
||||
translations/Drawing_pt-BR.qm \
|
||||
translations/Drawing_ru.qm \
|
||||
translations/Drawing_sv-SE.qm \
|
||||
translations/Drawing_uk.qm \
|
||||
translations/Drawing_zh-CN.qm \
|
||||
translations/Drawing_zh-TW.qm \
|
||||
translations/Drawing_cs.qm \
|
||||
translations/Drawing_tr.qm \
|
||||
translations/Drawing_ro.qm \
|
||||
translations/Drawing_sk.qm \
|
||||
translations/Drawing_ja.qm \
|
||||
translations/Drawing_hu.qm \
|
||||
translations/Drawing_af.ts \
|
||||
translations/Drawing_de.ts \
|
||||
translations/Drawing_es-ES.ts \
|
||||
translations/Drawing_fi.ts \
|
||||
translations/Drawing_fr.ts \
|
||||
translations/Drawing_hr.ts \
|
||||
translations/Drawing_it.ts \
|
||||
translations/Drawing_nl.ts \
|
||||
translations/Drawing_no.ts \
|
||||
translations/Drawing_pl.ts \
|
||||
translations/Drawing_pt-BR.ts \
|
||||
translations/Drawing_ru.ts \
|
||||
translations/Drawing_sv-SE.ts \
|
||||
translations/Drawing_uk.ts \
|
||||
translations/Drawing_zh-CN.ts \
|
||||
translations/Drawing_zh-TW.ts \
|
||||
translations/Drawing_cs.ts \
|
||||
translations/Drawing_tr.ts \
|
||||
translations/Drawing_ro.ts \
|
||||
translations/Drawing_sk.ts \
|
||||
translations/Drawing_ja.ts \
|
||||
translations/Drawing_hu.ts \
|
||||
Drawing.qrc \
|
||||
UpdateResources.bat
|
||||
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
moc_%.cpp: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rule for Qt MetaObject Compiler:
|
||||
%.moc: %.h
|
||||
$(QT_MOC) $< -o $(@F)
|
||||
|
||||
# rules for Qt Resource Compiler:
|
||||
qrc_%.cpp: %.qrc
|
||||
$(QT_RCC) -name $(*F) $< -o $(@F)
|
||||
|
||||
|
||||
# set the include path found by configure
|
||||
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(srcdir)/.. $(QT_CXXFLAGS) $(all_includes)
|
||||
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
@@ -1,11 +0,0 @@
|
||||
SUBDIRS=App Gui Templates
|
||||
|
||||
# Change data dir from default ($(prefix)/share) to $(prefix)
|
||||
datadir = $(prefix)/Mod/Drawing
|
||||
|
||||
data_DATA = Init.py InitGui.py DrawingAlgos.py DrawingExample.py DrawingTests.py
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(data_DATA) \
|
||||
CMakeLists.txt \
|
||||
drawing.dox
|
||||
@@ -1,9 +0,0 @@
|
||||
# Change data dir from default $(datadir) to $(datadir)/Mod/Drawing/Templates
|
||||
datadir = @datadir@/Mod/Drawing/Templates
|
||||
data_DATA = \
|
||||
A3_Landscape.svg \
|
||||
A4_Landscape.svg \
|
||||
A4_Simple.svg
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(data_DATA)
|
||||
Reference in New Issue
Block a user