[Libreoffice-commits] core.git: 3 commits - configure.ac extras/source solenv/inc sw/source sw/uiconfig
Caolán McNamara
caolanm at redhat.com
Thu Feb 28 06:44:47 PST 2013
configure.ac | 3
extras/source/glade/libreoffice-catalog.xml | 6
solenv/inc/_cppunit.mk | 120
solenv/inc/_tg_app.mk | 2100 -----------
solenv/inc/_tg_def.mk | 1650 --------
solenv/inc/_tg_lib.mk | 850 ----
solenv/inc/_tg_rslb.mk | 360 -
solenv/inc/_tg_scp.mk | 130
solenv/inc/_tg_sdi.mk | 197 -
solenv/inc/_tg_shl.mk | 4920 --------------------------
solenv/inc/_tg_srs.mk | 427 --
solenv/inc/_tg_zip.mk | 760 ----
solenv/inc/ant.mk | 96
solenv/inc/antsettings.mk | 97
solenv/inc/cppunit.mk | 56
solenv/inc/extension_post.mk | 121
solenv/inc/extension_pre.mk | 58
solenv/inc/found_no.mk | 5
solenv/inc/installationtest.mk | 158
solenv/inc/javaunittest.mk | 101
solenv/inc/lang.mk | 48
solenv/inc/libs.mk | 467 --
solenv/inc/pkg_config.mk | 40
solenv/inc/postset.mk | 26
solenv/inc/productversion.mk | 28
solenv/inc/pstrules.mk | 152
solenv/inc/rules.mk | 699 ---
solenv/inc/set_ext.mk | 28
solenv/inc/set_wntx64.mk | 221 -
solenv/inc/settings.mk | 1219 ------
solenv/inc/startup/Readme | 6
solenv/inc/startup/startup.mk | 107
solenv/inc/startup/summary | 3
solenv/inc/startup/wnt/macros.mk | 24
solenv/inc/target.mk | 1931 ----------
solenv/inc/templates/extension_tmpl.mk | 144
solenv/inc/tg_app.mk | 242 -
solenv/inc/tg_compv.mk | 144
solenv/inc/tg_config.mk | 199 -
solenv/inc/tg_def.mk | 197 -
solenv/inc/tg_dep.mk | 86
solenv/inc/tg_ext.mk | 373 -
solenv/inc/tg_help.mk | 87
solenv/inc/tg_jar.mk | 86
solenv/inc/tg_java.mk | 79
solenv/inc/tg_javav.mk | 44
solenv/inc/tg_lib.mk | 117
solenv/inc/tg_merge.mk | 52
solenv/inc/tg_moz.mk | 80
solenv/inc/tg_obj.mk | 75
solenv/inc/tg_res.mk | 42
solenv/inc/tg_rslb.mk | 67
solenv/inc/tg_scp.mk | 45
solenv/inc/tg_sdi.mk | 41
solenv/inc/tg_shl.mk | 531 --
solenv/inc/tg_slo.mk | 84
solenv/inc/tg_srs.mk | 64
solenv/inc/tg_wntx64.mk | 489 --
solenv/inc/tg_yxx.mk | 48
solenv/inc/tg_zip.mk | 107
solenv/inc/unitools.mk | 184
solenv/inc/unx.mk | 202 -
solenv/inc/unxaigppc.mk | 65
solenv/inc/unxaixp.mk | 109
solenv/inc/unxand.mk | 80
solenv/inc/unxdfly.mk | 45
solenv/inc/unxfbsd.mk | 46
solenv/inc/unxgcc.mk | 289 -
solenv/inc/unxiosr.mk | 133
solenv/inc/unxlng.mk | 32
solenv/inc/unxlnga.mk | 32
solenv/inc/unxlngaxp.mk | 34
solenv/inc/unxlnghppa.mk | 34
solenv/inc/unxlngi.mk | 37
solenv/inc/unxlngm68k.mk | 33
solenv/inc/unxlngmips.mk | 32
solenv/inc/unxlngppc.mk | 33
solenv/inc/unxlngppc64.mk | 25
solenv/inc/unxlngr.mk | 33
solenv/inc/unxlngs.mk | 35
solenv/inc/unxlngs390.mk | 33
solenv/inc/unxlngs390x.mk | 24
solenv/inc/unxlngx.mk | 32
solenv/inc/unxmacx.mk | 265 -
solenv/inc/unxmacxi.mk | 47
solenv/inc/unxmacxp.mk | 35
solenv/inc/unxmacxx.mk | 48
solenv/inc/unxnbsd.mk | 24
solenv/inc/unxobsd.mk | 46
solenv/inc/unxsogi.mk | 136
solenv/inc/unxsogs.mk | 138
solenv/inc/unxsoli4.mk | 226 -
solenv/inc/unxsols4.mk | 232 -
solenv/inc/unxsolu4.mk | 227 -
solenv/inc/wnt.mk | 75
solenv/inc/wntgcci.mk | 213 -
solenv/inc/wntmsc.mk | 354 -
sw/source/core/doc/doclay.cxx | 6
sw/source/ui/frmdlg/cption.cxx | 5
sw/uiconfig/swriter/ui/bulletsandnumbering.ui | 4
sw/uiconfig/swriter/ui/columnwidth.ui | 18
sw/uiconfig/swriter/ui/editcategories.ui | 4
sw/uiconfig/swriter/ui/sortdialog.ui | 33
sw/uiconfig/swriter/ui/stringinput.ui | 9
104 files changed, 54 insertions(+), 24430 deletions(-)
New commits:
commit 2a9c14730d93ea434cb456d248c37c7ff41fa6c0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 28 12:59:11 2013 +0000
Resolves: fdo#36668 allow image captions above image
orientation is the *second* argument, not the first,
which may be why this was never implemented, because
setting BOTTOM "didn't work".
Change-Id: Ief9b7f3ef7f696d38a3da73f9e38fe30a2d6c855
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 2d09882..767f725 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1347,8 +1347,10 @@ lcl_InsertLabel(SwDoc & rDoc, SwTxtFmtColls *const pTxtFmtCollTbl,
pNewSet->Put( SwFmtSurround( SURROUND_NONE ) );
pNewSet->Put( SvxOpaqueItem( RES_OPAQUE, sal_True ) );
- pNewSet->Put( SwFmtVertOrient( text::VertOrientation::TOP ) );
- pNewSet->Put( SwFmtHoriOrient( text::HoriOrientation::CENTER ) );
+
+ sal_Int16 eVert = bBefore ? text::VertOrientation::BOTTOM : text::VertOrientation::TOP;
+ pNewSet->Put( SwFmtVertOrient( 0, eVert ) );
+ pNewSet->Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER ) );
aFrmSize = pOldFmt->GetFrmSize();
aFrmSize.SetWidthPercent( 100 );
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index ab1e5d8..ba23652 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -239,11 +239,6 @@ SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
break;
}
m_pPosBox->SelectEntryPos(1);
- if (eType & (nsSelectionType::SEL_GRF|nsSelectionType::SEL_DRW))
- {
- m_pPosText->Enable( sal_False );
- m_pPosBox->Enable( sal_False );
- }
m_pCategoryBox->GetModifyHdl().Call(m_pCategoryBox);
commit 3ba44a1e25e63659b4b10840fa83067fb0008f7d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 28 13:40:57 2013 +0000
various efforts to consistently apply HIG rules
Change-Id: Iada517a5addaeacbc83f46e55773ae373098c95e
diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml
index 1d53b23..adf3d77 100644
--- a/extras/source/glade/libreoffice-catalog.xml
+++ b/extras/source/glade/libreoffice-catalog.xml
@@ -69,6 +69,12 @@
<glade-widget-class title="Text Direction ListBox" name="svxlo-FrameDirectionListBox"
generic-name="FrameDirectionListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Category Edit" name="swuilo-FEdit"
+ generic-name="CategoryEdit" parent="GtkEntry"
+ icon-name="widget-gtk-textentry"/>
+ <glade-widget-class title="Glossary List" name="swuilo-SwGlossaryGroupTLB"
+ generic-name="Glossary List" parent="GtkTreeView"
+ icon-name="widget-gtk-treeview"/>
<glade-widget-class title="VclComboBoxText" name="VclComboBoxText"
generic-name="ComboBoxText" parent="GtkComboBoxText"
diff --git a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
index 143613b..d54039d 100644
--- a/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
+++ b/sw/uiconfig/swriter/ui/bulletsandnumbering.ui
@@ -3,7 +3,7 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="BulletsAndNumberingDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Bullets and Numbering</property>
<property name="window_position">mouse</property>
<property name="type_hint">dialog</property>
@@ -11,7 +11,7 @@
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/columnwidth.ui b/sw/uiconfig/swriter/ui/columnwidth.ui
index d14a81b..697bfe3 100644
--- a/sw/uiconfig/swriter/ui/columnwidth.ui
+++ b/sw/uiconfig/swriter/ui/columnwidth.ui
@@ -10,13 +10,13 @@
</object>
<object class="GtkDialog" id="ColumnWidthDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Column Width</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -25,12 +25,10 @@
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -42,11 +40,9 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -58,11 +54,9 @@
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -95,13 +89,15 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">10</property>
- <property name="column_spacing">10</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Column</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">column</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -115,6 +111,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Width</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">width:0mm</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/sw/uiconfig/swriter/ui/editcategories.ui b/sw/uiconfig/swriter/ui/editcategories.ui
index 4e4555b..f00c98b 100644
--- a/sw/uiconfig/swriter/ui/editcategories.ui
+++ b/sw/uiconfig/swriter/ui/editcategories.ui
@@ -3,13 +3,13 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="EditCategoriesDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Edit Categories</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index 3c0306c..c392986 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="upper">99</property>
@@ -10,14 +11,14 @@
</object>
<object class="GtkDialog" id="SortDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="title" translatable="yes">Sort</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -27,6 +28,7 @@
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
@@ -78,23 +80,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">5</property>
- <property name="column_spacing">15</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="column">
<property name="visible">True</property>
@@ -148,6 +155,7 @@
<object class="GtkGrid" id="grid8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="up1">
<property name="label" translatable="yes">Ascending</property>
@@ -197,6 +205,7 @@
<object class="GtkGrid" id="grid9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="up2">
<property name="label" translatable="yes">Ascending</property>
@@ -245,6 +254,7 @@
<object class="GtkGrid" id="grid10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
<child>
<object class="GtkRadioButton" id="up3">
<property name="label" translatable="yes">Ascending</property>
@@ -403,6 +413,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="entry_text_column">0</property>
<accessibility>
<relation type="labelled-by" target="keytype"/>
@@ -421,6 +432,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="button_sensitivity">off</property>
<accessibility>
<relation type="labelled-by" target="keytype"/>
@@ -438,6 +450,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
+ <property name="hexpand">True</property>
<accessibility>
<relation type="labelled-by" target="keytype"/>
</accessibility>
@@ -478,8 +491,9 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">10</property>
- <property name="column_spacing">30</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
@@ -490,6 +504,7 @@
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid3">
@@ -565,6 +580,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">end</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid4">
@@ -694,7 +710,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -705,6 +722,7 @@
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="svxcorelo-SvxLanguageBox" id="langlb">
@@ -742,6 +760,7 @@
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="matchcase">
diff --git a/sw/uiconfig/swriter/ui/stringinput.ui b/sw/uiconfig/swriter/ui/stringinput.ui
index 808b4ac..d764c60 100644
--- a/sw/uiconfig/swriter/ui/stringinput.ui
+++ b/sw/uiconfig/swriter/ui/stringinput.ui
@@ -3,13 +3,13 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="StringInputDialog">
<property name="can_focus">False</property>
- <property name="border_width">5</property>
+ <property name="border_width">6</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">2</property>
+ <property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
@@ -59,8 +59,7 @@
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
- <property name="row_spacing">10</property>
- <property name="column_spacing">10</property>
+ <property name="row_spacing">6</property>
<property name="column_homogeneous">True</property>
<child>
<object class="GtkLabel" id="name">
@@ -68,6 +67,8 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">edit</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
commit 270c204d336e17ee311d29ddff37392a823d34c2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Feb 28 13:16:54 2013 +0000
remove the unused dmake solenv .mk files
note that the remaining langlist.mk and minor.mk are included by gbuild
makefiles
Change-Id: Ib3285cbba0e10ec033bb5968bad5ef9a7d507dd8
diff --git a/configure.ac b/configure.ac
index c4c221c..e6f78a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3144,7 +3144,7 @@ if test "$_os" = "WINNT"; then
fi
AC_SUBST(BUILD_X64)
- # These are passed to the environment and then used in set_wntx64.mk
+ # These are passed to the environment and then used in gbuild/platform/com_MSC_class.mk
AC_SUBST(CXX_X64_BINARY)
AC_SUBST(LINK_X64_BINARY)
AC_SUBST(LIBMGR_X64_BINARY)
@@ -4053,7 +4053,6 @@ if test "$cross_compiling" = "yes"; then
bin/get_config_variables \
solenv/bin/getcompver.awk \
solenv/inc/langlist.mk \
- solenv/inc/postset.mk \
solenv/inc/minor.mk.in \
instsetoo_native/util/openoffice.lst.in) \
| (cd CONF-FOR-BUILD && tar xf -)
diff --git a/solenv/inc/_cppunit.mk b/solenv/inc/_cppunit.mk
deleted file mode 100644
index 8f9f973..0000000
--- a/solenv/inc/_cppunit.mk
+++ /dev/null
@@ -1,120 +0,0 @@
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL1TARGETN)"!="" && "$(SHL1CPPUNITTEST)"!="FALSE"
-ALLTAR : test1
-test1 .PHONY : $(SHL1TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#1 on library $(SHL1TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL1TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL2TARGETN)"!="" && "$(SHL2CPPUNITTEST)"!="FALSE"
-ALLTAR : test2
-test2 .PHONY : $(SHL2TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#2 on library $(SHL2TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL2TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL3TARGETN)"!="" && "$(SHL3CPPUNITTEST)"!="FALSE"
-ALLTAR : test3
-test3 .PHONY : $(SHL3TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#3 on library $(SHL3TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL3TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL4TARGETN)"!="" && "$(SHL4CPPUNITTEST)"!="FALSE"
-ALLTAR : test4
-test4 .PHONY : $(SHL4TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#4 on library $(SHL4TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL4TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL5TARGETN)"!="" && "$(SHL5CPPUNITTEST)"!="FALSE"
-ALLTAR : test5
-test5 .PHONY : $(SHL5TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#5 on library $(SHL5TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL5TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL6TARGETN)"!="" && "$(SHL6CPPUNITTEST)"!="FALSE"
-ALLTAR : test6
-test6 .PHONY : $(SHL6TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#6 on library $(SHL6TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL6TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL7TARGETN)"!="" && "$(SHL7CPPUNITTEST)"!="FALSE"
-ALLTAR : test7
-test7 .PHONY : $(SHL7TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#7 on library $(SHL7TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL7TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL8TARGETN)"!="" && "$(SHL8CPPUNITTEST)"!="FALSE"
-ALLTAR : test8
-test8 .PHONY : $(SHL8TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#8 on library $(SHL8TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL8TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL9TARGETN)"!="" && "$(SHL9CPPUNITTEST)"!="FALSE"
-ALLTAR : test9
-test9 .PHONY : $(SHL9TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#9 on library $(SHL9TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL9TARGETN)
-.ENDIF
-
-# unroll begin
-# ---- create the test libraries ------------------------------------
-
-.IF "$(SHL10TARGETN)"!="" && "$(SHL10CPPUNITTEST)"!="FALSE"
-ALLTAR : test10
-test10 .PHONY : $(SHL10TARGETN)
- @echo ----------------------------------------------------------
- @echo - start unit test \#10 on library $(SHL10TARGETN)
- @echo ----------------------------------------------------------
- $(CPPUNITTESTER) $(SHL10TARGETN)
-.ENDIF
-
diff --git a/solenv/inc/_tg_app.mk b/solenv/inc/_tg_app.mk
deleted file mode 100644
index ec70788..0000000
--- a/solenv/inc/_tg_app.mk
+++ /dev/null
@@ -1,2100 +0,0 @@
-# unroll begin
-
-.IF "$(APP1LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP1LINKTYPEFLAG=$(APPLINK$(APP1LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP1CODETYPE)"=="C"
-APP1LINKER=$(LINKC)
-APP1STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP1LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP1CODETYPE)"=="C"
-APP1LINKER=$(LINK)
-APP1STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP1LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP1CODETYPE)"=="C"
-
-APP1RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP1RPATH)*=/ERROR:/Bad_APP1RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP1LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP1RPATH))
-.ENDIF
-
-.IF "$(APP1STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP1STACKN=$(LINKFLAGSTACK)$(APP1STACK)
-.ENDIF
-.ELSE
-APP1STACKN=
-.ENDIF
-
-.IF "$(APP1NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP1STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP1RESO=
-.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
-APP1RESO=$(MISC)/$(APP1TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP1DEPN+:=$(APP1DEPNU)
-USE_APP1DEF=
-.ENDIF
-
-.IF "$(APP1TARGETN)"!=""
-
-.IF "$(APP1PRODUCTNAME)"!=""
-APP1PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP1PRODUCTNAME)\"
-.ENDIF # "$(APP1PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP1LIBS)"!=""
-$(MISC)/$(APP1TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP1LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP1LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP1TARGETN:b)_linkinc.ls
-$(APP1TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP1LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP1TARGETN): $(APP1OBJS) $(APP1LIBS) \
- $(APP1RES) \
- $(APP1ICON) $(APP1DEPN) $(USE_APP1DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP1OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP1LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP1LINKTYPEFLAG) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_1.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_1.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_1.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP1RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_1.cmd
- @echo $(APP1LINKER) $(APP1LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP1OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_1.cmd
- @cat $(mktmp /dev/null $(APP1LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_1.cmd
- @echo $(APP1LINKTYPEFLAG) $(APP1LIBSALCPPRT) $(APP1STDLIBS) $(APP1STDLIB) $(STDLIB1) -o $@ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_1.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP1LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP1LINKRES:b).rc
-.IF "$(APP1ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP1ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF # "$(APP1ICON)" != ""
-.IF "$(APP1VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP1LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP1VERINFO)$(EMQ)" >> $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF # "$(APP1VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP1LINKRES:b).res $(MISC)/$(APP1LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP1PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP1LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP1LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP1LINKRES)" != "" || "$(APP1RES)" != ""
- @cat $(APP1LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP1RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP1RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP1BASEX) $(APP1STACKN) -o $@ $(APP1OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP1RESO) \
- `$(TYPE) /dev/null $(APP1LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP1LIBSALCPPRT) \
- -Wl,--start-group $(APP1STDLIBS) -Wl,--end-group $(APP1STDLIB) \
- $(STDLIB1) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_1.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_1.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_1.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP1LINKER) @$(mktmp \
- $(APP1LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP1BASEX) \
- $(APP1STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP1TARGET)).map} \
- $(STDOBJ) \
- $(APP1LINKRES) \
- $(APP1RES) \
- $(APP1OBJS) \
- $(APP1LIBS) \
- $(APP1STDLIBS) \
- $(APP1STDLIB) $(STDLIB1) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP1TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP1TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP1TARGET).lst
- $(APP1LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP1BASEX) \
- $(APP1STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP1LINKRES) \
- $(APP1RES) \
- $(APP1OBJS) \
- $(APP1LIBS) \
- $(APP1STDLIBS) \
- $(APP1STDLIB) $(STDLIB1))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP1TARGETN:b)_linkobj.lst >> $(MISC)\$(APP1TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP1TARGET).lst $(THEN) type $(MISC)/$(APP1TARGET).lst >> $(MISC)/$(APP1TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP1LINKER) @$(MISC)\$(APP1TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP1TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP1TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP2LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP2LINKTYPEFLAG=$(APPLINK$(APP2LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP2CODETYPE)"=="C"
-APP2LINKER=$(LINKC)
-APP2STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP2LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP2CODETYPE)"=="C"
-APP2LINKER=$(LINK)
-APP2STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP2LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP2CODETYPE)"=="C"
-
-APP2RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP2RPATH)*=/ERROR:/Bad_APP2RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP2LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP2RPATH))
-.ENDIF
-
-.IF "$(APP2STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP2STACKN=$(LINKFLAGSTACK)$(APP2STACK)
-.ENDIF
-.ELSE
-APP2STACKN=
-.ENDIF
-
-.IF "$(APP2NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP2STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP2RESO=
-.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
-APP2RESO=$(MISC)/$(APP2TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP2DEPN+:=$(APP2DEPNU)
-USE_APP2DEF=
-.ENDIF
-
-.IF "$(APP2TARGETN)"!=""
-
-.IF "$(APP2PRODUCTNAME)"!=""
-APP2PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP2PRODUCTNAME)\"
-.ENDIF # "$(APP2PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP2LIBS)"!=""
-$(MISC)/$(APP2TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP2LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP2LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP2TARGETN:b)_linkinc.ls
-$(APP2TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP2LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP2TARGETN): $(APP2OBJS) $(APP2LIBS) \
- $(APP2RES) \
- $(APP2ICON) $(APP2DEPN) $(USE_APP2DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP2OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP2LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP2LINKTYPEFLAG) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_2.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_2.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_2.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP2RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_2.cmd
- @echo $(APP2LINKER) $(APP2LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP2OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_2.cmd
- @cat $(mktmp /dev/null $(APP2LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_2.cmd
- @echo $(APP2LINKTYPEFLAG) $(APP2LIBSALCPPRT) $(APP2STDLIBS) $(APP2STDLIB) $(STDLIB2) -o $@ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_2.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP2LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP2LINKRES:b).rc
-.IF "$(APP2ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP2ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF # "$(APP2ICON)" != ""
-.IF "$(APP2VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP2LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP2VERINFO)$(EMQ)" >> $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF # "$(APP2VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP2LINKRES:b).res $(MISC)/$(APP2LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP2PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP2LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP2LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP2LINKRES)" != "" || "$(APP2RES)" != ""
- @cat $(APP2LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP2RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP2RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP2BASEX) $(APP2STACKN) -o $@ $(APP2OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP2RESO) \
- `$(TYPE) /dev/null $(APP2LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP2LIBSALCPPRT) \
- -Wl,--start-group $(APP2STDLIBS) -Wl,--end-group $(APP2STDLIB) \
- $(STDLIB2) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_2.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_2.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_2.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP2LINKER) @$(mktmp \
- $(APP2LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP2BASEX) \
- $(APP2STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP2TARGET)).map} \
- $(STDOBJ) \
- $(APP2LINKRES) \
- $(APP2RES) \
- $(APP2OBJS) \
- $(APP2LIBS) \
- $(APP2STDLIBS) \
- $(APP2STDLIB) $(STDLIB2) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP2TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP2TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP2TARGET).lst
- $(APP2LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP2BASEX) \
- $(APP2STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP2LINKRES) \
- $(APP2RES) \
- $(APP2OBJS) \
- $(APP2LIBS) \
- $(APP2STDLIBS) \
- $(APP2STDLIB) $(STDLIB2))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP2TARGETN:b)_linkobj.lst >> $(MISC)\$(APP2TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP2TARGET).lst $(THEN) type $(MISC)/$(APP2TARGET).lst >> $(MISC)/$(APP2TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP2LINKER) @$(MISC)\$(APP2TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP2TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP2TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP3LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP3LINKTYPEFLAG=$(APPLINK$(APP3LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP3CODETYPE)"=="C"
-APP3LINKER=$(LINKC)
-APP3STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP3LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP3CODETYPE)"=="C"
-APP3LINKER=$(LINK)
-APP3STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP3LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP3CODETYPE)"=="C"
-
-APP3RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP3RPATH)*=/ERROR:/Bad_APP3RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP3LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP3RPATH))
-.ENDIF
-
-.IF "$(APP3STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP3STACKN=$(LINKFLAGSTACK)$(APP3STACK)
-.ENDIF
-.ELSE
-APP3STACKN=
-.ENDIF
-
-.IF "$(APP3NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP3STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP3RESO=
-.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
-APP3RESO=$(MISC)/$(APP3TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP3DEPN+:=$(APP3DEPNU)
-USE_APP3DEF=
-.ENDIF
-
-.IF "$(APP3TARGETN)"!=""
-
-.IF "$(APP3PRODUCTNAME)"!=""
-APP3PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP3PRODUCTNAME)\"
-.ENDIF # "$(APP3PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP3LIBS)"!=""
-$(MISC)/$(APP3TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP3LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP3LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP3TARGETN:b)_linkinc.ls
-$(APP3TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP3LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP3TARGETN): $(APP3OBJS) $(APP3LIBS) \
- $(APP3RES) \
- $(APP3ICON) $(APP3DEPN) $(USE_APP3DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP3OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP3LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP3LINKTYPEFLAG) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_3.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_3.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_3.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP3RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_3.cmd
- @echo $(APP3LINKER) $(APP3LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP3OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_3.cmd
- @cat $(mktmp /dev/null $(APP3LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_3.cmd
- @echo $(APP3LINKTYPEFLAG) $(APP3LIBSALCPPRT) $(APP3STDLIBS) $(APP3STDLIB) $(STDLIB3) -o $@ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_3.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP3LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP3LINKRES:b).rc
-.IF "$(APP3ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP3ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF # "$(APP3ICON)" != ""
-.IF "$(APP3VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP3LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP3VERINFO)$(EMQ)" >> $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF # "$(APP3VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP3LINKRES:b).res $(MISC)/$(APP3LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP3PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP3LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP3LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP3LINKRES)" != "" || "$(APP3RES)" != ""
- @cat $(APP3LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP3RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP3RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP3BASEX) $(APP3STACKN) -o $@ $(APP3OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP3RESO) \
- `$(TYPE) /dev/null $(APP3LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP3LIBSALCPPRT) \
- -Wl,--start-group $(APP3STDLIBS) -Wl,--end-group $(APP3STDLIB) \
- $(STDLIB3) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_3.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_3.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_3.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP3LINKER) @$(mktmp \
- $(APP3LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP3BASEX) \
- $(APP3STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP3TARGET)).map} \
- $(STDOBJ) \
- $(APP3LINKRES) \
- $(APP3RES) \
- $(APP3OBJS) \
- $(APP3LIBS) \
- $(APP3STDLIBS) \
- $(APP3STDLIB) $(STDLIB3) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP3TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP3TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP3TARGET).lst
- $(APP3LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP3BASEX) \
- $(APP3STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP3LINKRES) \
- $(APP3RES) \
- $(APP3OBJS) \
- $(APP3LIBS) \
- $(APP3STDLIBS) \
- $(APP3STDLIB) $(STDLIB3))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP3TARGETN:b)_linkobj.lst >> $(MISC)\$(APP3TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP3TARGET).lst $(THEN) type $(MISC)/$(APP3TARGET).lst >> $(MISC)/$(APP3TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP3LINKER) @$(MISC)\$(APP3TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP3TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP3TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP4LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP4LINKTYPEFLAG=$(APPLINK$(APP4LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP4CODETYPE)"=="C"
-APP4LINKER=$(LINKC)
-APP4STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP4LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP4CODETYPE)"=="C"
-APP4LINKER=$(LINK)
-APP4STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP4LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP4CODETYPE)"=="C"
-
-APP4RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP4RPATH)*=/ERROR:/Bad_APP4RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP4LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP4RPATH))
-.ENDIF
-
-.IF "$(APP4STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP4STACKN=$(LINKFLAGSTACK)$(APP4STACK)
-.ENDIF
-.ELSE
-APP4STACKN=
-.ENDIF
-
-.IF "$(APP4NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP4STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP4RESO=
-.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
-APP4RESO=$(MISC)/$(APP4TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP4DEPN+:=$(APP4DEPNU)
-USE_APP4DEF=
-.ENDIF
-
-.IF "$(APP4TARGETN)"!=""
-
-.IF "$(APP4PRODUCTNAME)"!=""
-APP4PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP4PRODUCTNAME)\"
-.ENDIF # "$(APP4PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP4LIBS)"!=""
-$(MISC)/$(APP4TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP4LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP4LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP4TARGETN:b)_linkinc.ls
-$(APP4TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP4LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP4TARGETN): $(APP4OBJS) $(APP4LIBS) \
- $(APP4RES) \
- $(APP4ICON) $(APP4DEPN) $(USE_APP4DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP4OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP4LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP4LINKTYPEFLAG) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_4.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_4.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_4.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP4RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_4.cmd
- @echo $(APP4LINKER) $(APP4LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP4OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_4.cmd
- @cat $(mktmp /dev/null $(APP4LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_4.cmd
- @echo $(APP4LINKTYPEFLAG) $(APP4LIBSALCPPRT) $(APP4STDLIBS) $(APP4STDLIB) $(STDLIB4) -o $@ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_4.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP4LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP4LINKRES:b).rc
-.IF "$(APP4ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP4ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF # "$(APP4ICON)" != ""
-.IF "$(APP4VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP4LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP4VERINFO)$(EMQ)" >> $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF # "$(APP4VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP4LINKRES:b).res $(MISC)/$(APP4LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP4PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP4LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP4LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP4LINKRES)" != "" || "$(APP4RES)" != ""
- @cat $(APP4LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP4RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP4RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP4BASEX) $(APP4STACKN) -o $@ $(APP4OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP4RESO) \
- `$(TYPE) /dev/null $(APP4LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP4LIBSALCPPRT) \
- -Wl,--start-group $(APP4STDLIBS) -Wl,--end-group $(APP4STDLIB) \
- $(STDLIB4) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_4.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_4.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_4.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP4LINKER) @$(mktmp \
- $(APP4LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP4BASEX) \
- $(APP4STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP4TARGET)).map} \
- $(STDOBJ) \
- $(APP4LINKRES) \
- $(APP4RES) \
- $(APP4OBJS) \
- $(APP4LIBS) \
- $(APP4STDLIBS) \
- $(APP4STDLIB) $(STDLIB4) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP4TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP4TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP4TARGET).lst
- $(APP4LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP4BASEX) \
- $(APP4STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP4LINKRES) \
- $(APP4RES) \
- $(APP4OBJS) \
- $(APP4LIBS) \
- $(APP4STDLIBS) \
- $(APP4STDLIB) $(STDLIB4))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP4TARGETN:b)_linkobj.lst >> $(MISC)\$(APP4TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP4TARGET).lst $(THEN) type $(MISC)/$(APP4TARGET).lst >> $(MISC)/$(APP4TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP4LINKER) @$(MISC)\$(APP4TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP4TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP4TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP5LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP5LINKTYPEFLAG=$(APPLINK$(APP5LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP5CODETYPE)"=="C"
-APP5LINKER=$(LINKC)
-APP5STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP5LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP5CODETYPE)"=="C"
-APP5LINKER=$(LINK)
-APP5STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP5LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP5CODETYPE)"=="C"
-
-APP5RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP5RPATH)*=/ERROR:/Bad_APP5RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP5LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP5RPATH))
-.ENDIF
-
-.IF "$(APP5STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP5STACKN=$(LINKFLAGSTACK)$(APP5STACK)
-.ENDIF
-.ELSE
-APP5STACKN=
-.ENDIF
-
-.IF "$(APP5NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP5STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP5RESO=
-.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
-APP5RESO=$(MISC)/$(APP5TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP5DEPN+:=$(APP5DEPNU)
-USE_APP5DEF=
-.ENDIF
-
-.IF "$(APP5TARGETN)"!=""
-
-.IF "$(APP5PRODUCTNAME)"!=""
-APP5PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP5PRODUCTNAME)\"
-.ENDIF # "$(APP5PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP5LIBS)"!=""
-$(MISC)/$(APP5TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP5LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP5LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP5TARGETN:b)_linkinc.ls
-$(APP5TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP5LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP5TARGETN): $(APP5OBJS) $(APP5LIBS) \
- $(APP5RES) \
- $(APP5ICON) $(APP5DEPN) $(USE_APP5DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP5OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP5LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP5LINKTYPEFLAG) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_5.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_5.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_5.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP5RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_5.cmd
- @echo $(APP5LINKER) $(APP5LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP5OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_5.cmd
- @cat $(mktmp /dev/null $(APP5LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_5.cmd
- @echo $(APP5LINKTYPEFLAG) $(APP5LIBSALCPPRT) $(APP5STDLIBS) $(APP5STDLIB) $(STDLIB5) -o $@ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_5.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP5LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP5LINKRES:b).rc
-.IF "$(APP5ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP5ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF # "$(APP5ICON)" != ""
-.IF "$(APP5VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP5LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP5VERINFO)$(EMQ)" >> $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF # "$(APP5VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP5LINKRES:b).res $(MISC)/$(APP5LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP5PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP5LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP5LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP5LINKRES)" != "" || "$(APP5RES)" != ""
- @cat $(APP5LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP5RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP5RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP5BASEX) $(APP5STACKN) -o $@ $(APP5OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP5RESO) \
- `$(TYPE) /dev/null $(APP5LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP5LIBSALCPPRT) \
- -Wl,--start-group $(APP5STDLIBS) -Wl,--end-group $(APP5STDLIB) \
- $(STDLIB5) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_5.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_5.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_5.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP5LINKER) @$(mktmp \
- $(APP5LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP5BASEX) \
- $(APP5STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP5TARGET)).map} \
- $(STDOBJ) \
- $(APP5LINKRES) \
- $(APP5RES) \
- $(APP5OBJS) \
- $(APP5LIBS) \
- $(APP5STDLIBS) \
- $(APP5STDLIB) $(STDLIB5) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP5TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP5TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP5TARGET).lst
- $(APP5LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP5BASEX) \
- $(APP5STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP5LINKRES) \
- $(APP5RES) \
- $(APP5OBJS) \
- $(APP5LIBS) \
- $(APP5STDLIBS) \
- $(APP5STDLIB) $(STDLIB5))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP5TARGETN:b)_linkobj.lst >> $(MISC)\$(APP5TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP5TARGET).lst $(THEN) type $(MISC)/$(APP5TARGET).lst >> $(MISC)/$(APP5TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP5LINKER) @$(MISC)\$(APP5TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP5TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP5TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP6LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP6LINKTYPEFLAG=$(APPLINK$(APP6LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP6CODETYPE)"=="C"
-APP6LINKER=$(LINKC)
-APP6STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP6LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP6CODETYPE)"=="C"
-APP6LINKER=$(LINK)
-APP6STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP6LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP6CODETYPE)"=="C"
-
-APP6RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP6RPATH)*=/ERROR:/Bad_APP6RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP6LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP6RPATH))
-.ENDIF
-
-.IF "$(APP6STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP6STACKN=$(LINKFLAGSTACK)$(APP6STACK)
-.ENDIF
-.ELSE
-APP6STACKN=
-.ENDIF
-
-.IF "$(APP6NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP6STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP6RESO=
-.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
-APP6RESO=$(MISC)/$(APP6TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP6DEPN+:=$(APP6DEPNU)
-USE_APP6DEF=
-.ENDIF
-
-.IF "$(APP6TARGETN)"!=""
-
-.IF "$(APP6PRODUCTNAME)"!=""
-APP6PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP6PRODUCTNAME)\"
-.ENDIF # "$(APP6PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP6LIBS)"!=""
-$(MISC)/$(APP6TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP6LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP6LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP6TARGETN:b)_linkinc.ls
-$(APP6TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP6LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP6TARGETN): $(APP6OBJS) $(APP6LIBS) \
- $(APP6RES) \
- $(APP6ICON) $(APP6DEPN) $(USE_APP6DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP6OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP6LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP6LINKTYPEFLAG) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_6.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_6.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_6.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP6RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_6.cmd
- @echo $(APP6LINKER) $(APP6LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP6OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_6.cmd
- @cat $(mktmp /dev/null $(APP6LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_6.cmd
- @echo $(APP6LINKTYPEFLAG) $(APP6LIBSALCPPRT) $(APP6STDLIBS) $(APP6STDLIB) $(STDLIB6) -o $@ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_6.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP6LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP6LINKRES:b).rc
-.IF "$(APP6ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP6ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF # "$(APP6ICON)" != ""
-.IF "$(APP6VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP6LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP6VERINFO)$(EMQ)" >> $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF # "$(APP6VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP6LINKRES:b).res $(MISC)/$(APP6LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP6PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP6LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP6LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP6LINKRES)" != "" || "$(APP6RES)" != ""
- @cat $(APP6LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP6RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP6RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP6BASEX) $(APP6STACKN) -o $@ $(APP6OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP6RESO) \
- `$(TYPE) /dev/null $(APP6LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP6LIBSALCPPRT) \
- -Wl,--start-group $(APP6STDLIBS) -Wl,--end-group $(APP6STDLIB) \
- $(STDLIB6) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_6.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_6.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_6.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP6LINKER) @$(mktmp \
- $(APP6LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP6BASEX) \
- $(APP6STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP6TARGET)).map} \
- $(STDOBJ) \
- $(APP6LINKRES) \
- $(APP6RES) \
- $(APP6OBJS) \
- $(APP6LIBS) \
- $(APP6STDLIBS) \
- $(APP6STDLIB) $(STDLIB6) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP6TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP6TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP6TARGET).lst
- $(APP6LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP6BASEX) \
- $(APP6STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP6LINKRES) \
- $(APP6RES) \
- $(APP6OBJS) \
- $(APP6LIBS) \
- $(APP6STDLIBS) \
- $(APP6STDLIB) $(STDLIB6))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP6TARGETN:b)_linkobj.lst >> $(MISC)\$(APP6TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP6TARGET).lst $(THEN) type $(MISC)/$(APP6TARGET).lst >> $(MISC)/$(APP6TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP6LINKER) @$(MISC)\$(APP6TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP6TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP6TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP7LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP7LINKTYPEFLAG=$(APPLINK$(APP7LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP7CODETYPE)"=="C"
-APP7LINKER=$(LINKC)
-APP7STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP7LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP7CODETYPE)"=="C"
-APP7LINKER=$(LINK)
-APP7STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP7LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP7CODETYPE)"=="C"
-
-APP7RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP7RPATH)*=/ERROR:/Bad_APP7RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP7LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP7RPATH))
-.ENDIF
-
-.IF "$(APP7STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP7STACKN=$(LINKFLAGSTACK)$(APP7STACK)
-.ENDIF
-.ELSE
-APP7STACKN=
-.ENDIF
-
-.IF "$(APP7NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP7STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP7RESO=
-.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
-APP7RESO=$(MISC)/$(APP7TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP7DEPN+:=$(APP7DEPNU)
-USE_APP7DEF=
-.ENDIF
-
-.IF "$(APP7TARGETN)"!=""
-
-.IF "$(APP7PRODUCTNAME)"!=""
-APP7PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP7PRODUCTNAME)\"
-.ENDIF # "$(APP7PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP7LIBS)"!=""
-$(MISC)/$(APP7TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP7LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP7LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP7TARGETN:b)_linkinc.ls
-$(APP7TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP7LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP7TARGETN): $(APP7OBJS) $(APP7LIBS) \
- $(APP7RES) \
- $(APP7ICON) $(APP7DEPN) $(USE_APP7DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP7OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP7LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP7LINKTYPEFLAG) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_7.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_7.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_7.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP7RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_7.cmd
- @echo $(APP7LINKER) $(APP7LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP7OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_7.cmd
- @cat $(mktmp /dev/null $(APP7LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_7.cmd
- @echo $(APP7LINKTYPEFLAG) $(APP7LIBSALCPPRT) $(APP7STDLIBS) $(APP7STDLIB) $(STDLIB7) -o $@ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_7.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP7LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP7LINKRES:b).rc
-.IF "$(APP7ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP7ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF # "$(APP7ICON)" != ""
-.IF "$(APP7VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP7LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP7VERINFO)$(EMQ)" >> $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF # "$(APP7VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP7LINKRES:b).res $(MISC)/$(APP7LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP7PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP7LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP7LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP7LINKRES)" != "" || "$(APP7RES)" != ""
- @cat $(APP7LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP7RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP7RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP7BASEX) $(APP7STACKN) -o $@ $(APP7OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP7RESO) \
- `$(TYPE) /dev/null $(APP7LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP7LIBSALCPPRT) \
- -Wl,--start-group $(APP7STDLIBS) -Wl,--end-group $(APP7STDLIB) \
- $(STDLIB7) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_7.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_7.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_7.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP7LINKER) @$(mktmp \
- $(APP7LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP7BASEX) \
- $(APP7STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP7TARGET)).map} \
- $(STDOBJ) \
- $(APP7LINKRES) \
- $(APP7RES) \
- $(APP7OBJS) \
- $(APP7LIBS) \
- $(APP7STDLIBS) \
- $(APP7STDLIB) $(STDLIB7) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP7TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP7TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP7TARGET).lst
- $(APP7LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP7BASEX) \
- $(APP7STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP7LINKRES) \
- $(APP7RES) \
- $(APP7OBJS) \
- $(APP7LIBS) \
- $(APP7STDLIBS) \
- $(APP7STDLIB) $(STDLIB7))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP7TARGETN:b)_linkobj.lst >> $(MISC)\$(APP7TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP7TARGET).lst $(THEN) type $(MISC)/$(APP7TARGET).lst >> $(MISC)/$(APP7TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP7LINKER) @$(MISC)\$(APP7TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP7TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP7TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP8LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP8LINKTYPEFLAG=$(APPLINK$(APP8LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP8CODETYPE)"=="C"
-APP8LINKER=$(LINKC)
-APP8STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP8LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP8CODETYPE)"=="C"
-APP8LINKER=$(LINK)
-APP8STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP8LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP8CODETYPE)"=="C"
-
-APP8RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP8RPATH)*=/ERROR:/Bad_APP8RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP8LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP8RPATH))
-.ENDIF
-
-.IF "$(APP8STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP8STACKN=$(LINKFLAGSTACK)$(APP8STACK)
-.ENDIF
-.ELSE
-APP8STACKN=
-.ENDIF
-
-.IF "$(APP8NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP8STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP8RESO=
-.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
-APP8RESO=$(MISC)/$(APP8TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP8DEPN+:=$(APP8DEPNU)
-USE_APP8DEF=
-.ENDIF
-
-.IF "$(APP8TARGETN)"!=""
-
-.IF "$(APP8PRODUCTNAME)"!=""
-APP8PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP8PRODUCTNAME)\"
-.ENDIF # "$(APP8PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP8LIBS)"!=""
-$(MISC)/$(APP8TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP8LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP8LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP8TARGETN:b)_linkinc.ls
-$(APP8TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP8LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP8TARGETN): $(APP8OBJS) $(APP8LIBS) \
- $(APP8RES) \
- $(APP8ICON) $(APP8DEPN) $(USE_APP8DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP8OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP8LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP8LINKTYPEFLAG) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_8.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_8.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_8.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP8RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_8.cmd
- @echo $(APP8LINKER) $(APP8LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP8OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_8.cmd
- @cat $(mktmp /dev/null $(APP8LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_8.cmd
- @echo $(APP8LINKTYPEFLAG) $(APP8LIBSALCPPRT) $(APP8STDLIBS) $(APP8STDLIB) $(STDLIB8) -o $@ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_8.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP8LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP8LINKRES:b).rc
-.IF "$(APP8ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP8ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF # "$(APP8ICON)" != ""
-.IF "$(APP8VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP8LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP8VERINFO)$(EMQ)" >> $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF # "$(APP8VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP8LINKRES:b).res $(MISC)/$(APP8LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP8PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP8LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP8LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP8LINKRES)" != "" || "$(APP8RES)" != ""
- @cat $(APP8LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP8RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP8RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP8BASEX) $(APP8STACKN) -o $@ $(APP8OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP8RESO) \
- `$(TYPE) /dev/null $(APP8LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP8LIBSALCPPRT) \
- -Wl,--start-group $(APP8STDLIBS) -Wl,--end-group $(APP8STDLIB) \
- $(STDLIB8) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_8.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_8.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_8.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP8LINKER) @$(mktmp \
- $(APP8LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP8BASEX) \
- $(APP8STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP8TARGET)).map} \
- $(STDOBJ) \
- $(APP8LINKRES) \
- $(APP8RES) \
- $(APP8OBJS) \
- $(APP8LIBS) \
- $(APP8STDLIBS) \
- $(APP8STDLIB) $(STDLIB8) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP8TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP8TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP8TARGET).lst
- $(APP8LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP8BASEX) \
- $(APP8STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP8LINKRES) \
- $(APP8RES) \
- $(APP8OBJS) \
- $(APP8LIBS) \
- $(APP8STDLIBS) \
- $(APP8STDLIB) $(STDLIB8))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP8TARGETN:b)_linkobj.lst >> $(MISC)\$(APP8TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP8TARGET).lst $(THEN) type $(MISC)/$(APP8TARGET).lst >> $(MISC)/$(APP8TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP8LINKER) @$(MISC)\$(APP8TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP8TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
-.ENDIF # "$(OS)" == "WNT"
-
-.ENDIF # "$(APP8TARGETN)"!=""
-
-
-# Instruction for linking
-# unroll begin
-
-.IF "$(APP9LINKTYPE)" != ""
-#must be either STATIC or SHARED
-APP9LINKTYPEFLAG=$(APPLINK$(APP9LINKTYPE))
-.ENDIF
-
-# decide how to link
-.IF "$(APP9CODETYPE)"=="C"
-APP9LINKER=$(LINKC)
-APP9STDLIB=$(subst,CPPRUNTIME, $(STDLIB))
-APP9LINKFLAGS+=$(LINKCFLAGS)
-.ELSE # "$(APP9CODETYPE)"=="C"
-APP9LINKER=$(LINK)
-APP9STDLIB=$(subst,CPPRUNTIME,$(STDLIBCPP) $(STDLIB))
-APP9LINKFLAGS+=$(LINKFLAGS)
-.ENDIF # "$(APP9CODETYPE)"=="C"
-
-APP9RPATH*=OOO
-LINKFLAGSRUNPATH_$(APP9RPATH)*=/ERROR:/Bad_APP9RPATH_value
-.IF "$(OS)" != "MACOSX"
-APP9LINKFLAGS+=$(LINKFLAGSRUNPATH_$(APP9RPATH))
-.ENDIF
-
-.IF "$(APP9STACK)" != ""
-.IF "$(LINKFLAGSTACK)" != ""
-APP9STACKN=$(LINKFLAGSTACK)$(APP9STACK)
-.ENDIF
-.ELSE
-APP9STACKN=
-.ENDIF
-
-.IF "$(APP9NOSAL)"==""
-.IF "$(TARGETTYPE)" == "GUI"
-APP9STDLIB+= -lvclmain
-.ENDIF
-.ENDIF
-
-.IF "$(OS)$(COM)" == "WNTGCC"
-APP9RESO=
-.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
-APP9RESO=$(MISC)/$(APP9TARGET:b)_res.o
-.ENDIF
-.ENDIF
-
-.IF "$(OS)" != "WNT"
-APP9DEPN+:=$(APP9DEPNU)
-USE_APP9DEF=
-.ENDIF
-
-.IF "$(APP9TARGETN)"!=""
-
-.IF "$(APP9PRODUCTNAME)"!=""
-APP9PRODUCTDEF+:=-DPRODUCT_NAME=\"$(APP9PRODUCTNAME)\"
-.ENDIF # "$(APP9PRODUCTNAME)"!=""
-
-.IF "$(linkinc)"!=""
-.IF "$(OS)"=="WNT"
-.IF "$(APP9LIBS)"!=""
-$(MISC)/$(APP9TARGET)_linkinc.ls .PHONY:
- @@-$(RM) $@
- sed -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(APP9LIBS) $(i:s/.lib/.lin/)) >> $@
-.ENDIF #"$(APP9LIBS)"!=""
-.ENDIF
-
-LINKINCTARGETS+=$(MISC)/$(APP9TARGETN:b)_linkinc.ls
-$(APP9TARGETN) : $(LINKINCTARGETS)
-.ENDIF # "$(linkinc)"!=""
-
-# Allow for target specific LIBSALCPPRT override
-APP9LIBSALCPPRT*=$(LIBSALCPPRT)
-
-$(APP9TARGETN): $(APP9OBJS) $(APP9LIBS) \
- $(APP9RES) \
- $(APP9ICON) $(APP9DEPN) $(USE_APP9DEF)
- @echo "Making: " $(@:f)
-.IF "$(OS)"!="WNT"
-.IF "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(@:b).list
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
- @-$(RM) $(MISC)/$(@:b).strip
- @echo $(STDSLO) $(APP9OBJS:s/.obj/.o/) \
- `cat /dev/null $(APP9LIBS) | sed s\#$(ROUT)\#$(OUT)\#g` | tr -s " " "\n" > $(MISC)/$(@:b).list
- @/bin/echo -n $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) -o $@ \
- $(APP9LINKTYPEFLAG) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -filelist $(MISC)/$(@:b).list > $(MISC)/$(TARGET).$(@:b)_9.cmd
- @$(PERL) $(SOLARENV)/bin/macosx-dylib-link-list.pl \
- `cat $(MISC)/$(TARGET).$(@:b)_9.cmd` \
- >> $(MISC)/$(TARGET).$(@:b)_9.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-# Need to strip __objcInit symbol to avoid duplicate symbols when loading
-# libraries at runtime
- @-nm $@ | grep -v ' U ' | $(AWK) '{ print $$NF }' | grep -F -x '__objcInit' > $(MISC)/$(@:b).strip
- @strip -i -R $(MISC)/$(@:b).strip -X $@
- @$(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl \
- app $(APP9RPATH) $@
-.IF "$(TARGETTYPE)"=="GUI"
- @echo "Making: " $(@:f).app
- @macosx-create-bundle $@
-.ENDIF # "$(TARGETTYPE)"=="GUI"
-.ELSE # "$(OS)"=="MACOSX"
- @-$(RM) $(MISC)/$(TARGET).$(@:b)_9.cmd
- @echo $(APP9LINKER) $(APP9LINKFLAGS) $(LINKFLAGSAPP) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP9OBJS:s/.obj/.o/) '\' > $(MISC)/$(TARGET).$(@:b)_9.cmd
- @cat $(mktmp /dev/null $(APP9LIBS)) | xargs -n 1 cat | sed s\#$(ROUT)\#$(OUT)\#g | sed 's#$$# \\#' >> $(MISC)/$(TARGET).$(@:b)_9.cmd
- @echo $(APP9LINKTYPEFLAG) $(APP9LIBSALCPPRT) $(APP9STDLIBS) $(APP9STDLIB) $(STDLIB9) -o $@ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
- .IF "$(VERBOSE)" == "TRUE"
- @cat $(MISC)/$(TARGET).$(@:b)_9.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
- .IF "$(VERBOSE)" == "TRUE"
- .ENDIF
-.ENDIF # "$(OS)"=="MACOSX"
-.ENDIF
-.IF "$(OS)" == "WNT"
- @@-$(MKDIR) $(@:d:d)
-.IF "$(APP9LINKRES)" != ""
- @@-$(RM) $(MISC)/$(APP9LINKRES:b).rc
-.IF "$(APP9ICON)" != ""
- @-echo 1 ICON $(EMQ)"$(APP9ICON:s/\/\\/)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF # "$(APP9ICON)" != ""
-.IF "$(APP9VERINFO)" != ""
- @-echo $(EMQ)#define VERVARIANT $(BUILD) >> $(MISC)/$(APP9LINKRES:b).rc
- @-echo $(EMQ)#include $(EMQ)"$(APP9VERINFO)$(EMQ)" >> $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF # "$(APP9VERINFO)" != ""
-.IF "$(COM)" == "GCC"
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) -o $(MISC)/$(APP9LINKRES:b).res $(MISC)/$(APP9LINKRES:b).rc
-.ELSE
- $(COMMAND_ECHO)$(RC) -DWIN32 $(APP9PRODUCTDEF) -I$(SOLARRESDIR) $(INCLUDE) $(RCLINKFLAGS) $(MISC)/$(APP9LINKRES:b).rc
-.ENDIF
-.ENDIF # "$(APP9LINKRES)" != ""
-.IF "$(COM)" == "GCC"
-.IF "$(APP9LINKRES)" != "" || "$(APP9RES)" != ""
- @cat $(APP9LINKRES) $(subst,/res/,/res{$(subst,$(BIN), $(@:d))} $(APP9RES)) > $(MISC)/$(@:b)_all.res
- $(WINDRES) $(MISC)/$(@:b)_all.res $(APP9RESO)
-.ENDIF
- @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSAPP) $(MINGWSSTDOBJ) -L$(PRJ)/$(INPATH)/lib $(SOLARLIB) $(STDSLO) \
- $(APP9BASEX) $(APP9STACKN) -o $@ $(APP9OBJS) \
- -Wl,-Map,$(MISC)/$(@:b).map $(STDOBJ) $(APP9RESO) \
- `$(TYPE) /dev/null $(APP9LIBS) | sed s#$(ROUT)#$(OUT)#g` \
- $(APP_LINKTYPE) $(APP9LIBSALCPPRT) \
- -Wl,--start-group $(APP9STDLIBS) -Wl,--end-group $(APP9STDLIB) \
- $(STDLIB9) $(MINGWSSTDENDOBJ) > $(MISC)/$(TARGET).$(@:b)_9.cmd
-# need this comment line, else dmake somehow gets confused by the .IFs and .ENDIFs
- .IF "$(VERBOSE)" == "TRUE"
- @$(TYPE) $(MISC)/$(TARGET).$(@:b)_9.cmd
- .ENDIF
- @+source $(MISC)/$(TARGET).$(@:b)_9.cmd
-.ELSE # "$(COM)" == "GCC"
-.IF "$(linkinc)" == ""
- $(COMMAND_ECHO)$(APP9LINKER) @$(mktmp \
- $(APP9LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP9BASEX) \
- $(APP9STACKN) \
- -out:$@ \
- -map:$(MISC)/{$(subst,/,_ $(APP9TARGET)).map} \
- $(STDOBJ) \
- $(APP9LINKRES) \
- $(APP9RES) \
- $(APP9OBJS) \
- $(APP9LIBS) \
- $(APP9STDLIBS) \
- $(APP9STDLIB) $(STDLIB9) \
- )
- @-echo linking $@.manifest ...
-.IF "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -manifest $(TRUSTED_MANIFEST_LOCATION)/trustedinfo.manifest -out:$@.tmanifest$(EMQ) $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.tmanifest -outputresource:$@$(EMQ);1 $(FI)
-.ELSE
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(MT) $(MTFLAGS) -manifest $@.manifest -outputresource:$@$(EMQ);1 $(FI)
-.ENDIF # "$(VISTA_MANIFEST)"!=""
- $(COMMAND_ECHO)$(IFEXIST) $@.manifest $(THEN) $(RM:s/+//) $@.manifest $(FI)
- $(COMMAND_ECHO)$(IFEXIST) $@.tmanifest $(THEN) $(RM:s/+//) $@.tmanifest $(FI)
-.ELSE
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP9TARGET).lnk
- $(COMMAND_ECHO)-$(RM) $(MISC)\$(APP9TARGET).lst
- $(COMMAND_ECHO)-$(RM) $(MISC)\linkobj.lst
- for %_i in ($(MISC)\*.obj) do type %_i >> $(MISC)\linkobj.lst
- type $(mktmp,$(MISC)\$(APP9TARGET).lst
- $(APP9LINKFLAGS) \
- $(LINKFLAGSAPP) $(APP9BASEX) \
- $(APP9STACKN) \
- -out:$@ \
- $(STDOBJ) \
- $(APP9LINKRES) \
- $(APP9RES) \
- $(APP9OBJS) \
- $(APP9LIBS) \
- $(APP9STDLIBS) \
- $(APP9STDLIB) $(STDLIB9))
- $(COMMAND_ECHO)$(SED)$(SED) -e 's/\(\.\.\\\)\{2,4\}/..\\/g' $(MISC)\$(APP9TARGETN:b)_linkobj.lst >> $(MISC)\$(APP9TARGET).lst
- $(COMMAND_ECHO)$(SED)$(IFEXIST) $(MISC)/$(APP9TARGET).lst $(THEN) type $(MISC)/$(APP9TARGET).lst >> $(MISC)/$(APP9TARGET).lnk $(FI)
- $(COMMAND_ECHO)$(SED)$(APP9LINKER) @$(MISC)\$(APP9TARGET).lnk
-.ENDIF # "$(linkinc)" == ""
-.ENDIF # "$(COM)" == "GCC"
-.IF "$(APP9TARGET)" == "loader"
- $(COMMAND_ECHO)$(PERL) loader.pl $@
- $(COMMAND_ECHO)$(TYPE) $(@) $(@:d)unloader.exe > $(@:d)_new.exe
- $(COMMAND_ECHO)$(RM) $@
- $(COMMAND_ECHO)$(RENAME) $(@:d)_new.exe $(@:d)loader.exe
-.ENDIF # "$(TARGET)" == "setup"
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list