summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/deliver.pl24
-rw-r--r--solenv/bin/modules/installer/globals.pm11
-rw-r--r--solenv/bin/modules/installer/windows/idtglobal.pm10
-rw-r--r--solenv/bin/modules/installer/windows/registry.pm35
-rw-r--r--solenv/bin/modules/installer/xpdinstaller.pm16
-rw-r--r--solenv/config/sdev300.ini9
-rw-r--r--solenv/inc/libs.mk13
-rw-r--r--solenv/inc/minor.mk6
-rw-r--r--solenv/inc/postset.mk224
-rw-r--r--solenv/inc/set_wntx64.mk24
-rw-r--r--solenv/inc/tg_wntx64.mk12
11 files changed, 240 insertions, 144 deletions
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 9db619fe7902..d4d6c9c0bf5a 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -100,7 +100,6 @@ $files_copied = 0; # statistics
$files_unchanged = 0; # statistics
$opt_force = 0; # option force copy
-$opt_minor = 0; # option deliver in minor
$opt_check = 0; # do actually execute any action
$opt_zip = 0; # create an additional zip file
$opt_silent = 0; # be silent, only report errors
@@ -402,7 +401,6 @@ sub parse_options
my $dontdeletecommon = 0;
while ( $arg = shift @ARGV ) {
$arg =~ /^-force$/ and $opt_force = 1 and next;
- $arg =~ /^-minor$/ and $opt_minor = 1 and next;
$arg =~ /^-check$/ and $opt_check = 1 and $opt_verbose = 1 and next;
$arg =~ /^-quiet$/ and $opt_silent = 1 and next;
$arg =~ /^-verbose$/ and $opt_verbose = 1 and next;
@@ -484,14 +482,8 @@ sub init_globals
}
$ext = "";
- if ( ($opt_minor || $updminor) && !$dest ) {
- if ( $updminor ) {
- $ext = "$updminorext";
- }
- else {
- print_error("can't determine UPDMINOR", 0);
- exit(3);
- }
+ if ( ($updminor) && !$dest ) {
+ $ext = "$updminorext";
}
# Do we have common trees?
@@ -669,6 +661,7 @@ sub glob_line
my @file_list = glob($from);
foreach $file ( @file_list ) {
+ next if ( -d $file); # we only copy files, not directories
my ($fname, $dir) = fileparse($file);
my $copy = ($replace) ? $to_dir . $fname : $to . '/' . $fname;
push(@globbed_files, [$file, $copy]);
@@ -1124,7 +1117,7 @@ sub push_on_ziplist
return if ( $opt_check );
# strip $dest from path since we don't want to record it in zip file
if ( $file =~ s#^\Q$dest\E/##o ) {
- if ( $opt_minor ){
+ if ( $updminor ){
# strip minor from path
my $ext = "%_EXT%";
$ext = expand_macros($ext);
@@ -1132,7 +1125,7 @@ sub push_on_ziplist
}
push(@zip_list, $file);
} elsif ( $file =~ s#^\Q$common_dest\E/##o ) {
- if ( $opt_minor ){
+ if ( $updminor ){
# strip minor from path
my $ext = "%_EXT%";
$ext = expand_macros($ext);
@@ -1530,23 +1523,22 @@ sub cleanup_and_die
sub usage
{
my $exit_code = shift;
- print STDERR "Usage:\ndeliver [OPTION]... [DESTINATION-PATH]\n";
+ print STDERR "Usage:\ndeliver [OPTIONS] [DESTINATION-PATH]\n";
print STDERR "Options:\n";
print STDERR " -check just print what would happen, no actual copying of files\n";
print STDERR " -checkdlst be verbose about (possible) d.lst bugs\n";
print STDERR " -delete delete files (undeliver), use with care\n";
print STDERR " -deloutput remove the output tree after copying\n";
- print STDERR " -force copy even if not newer\n";
print STDERR " -dontdeletecommon do not delete common files (for -delete option)\n";
+ print STDERR " -force copy even if not newer\n";
print STDERR " -help print this message\n";
if ( !defined($ENV{GUI}) || $ENV{GUI} ne 'WNT' ) {
print STDERR " -link hard link files into the solver to save disk space\n";
}
- print STDERR " -minor deliver into minor (milestone)\n";
print STDERR " -quiet be quiet, only report errors\n";
print STDERR " -verbose be verbose\n";
print STDERR " -zip additionally create zip files of delivered content\n";
- print STDERR "Option '-zip' and a destination-path are mutually exclusive.\n";
+ print STDERR "Options '-zip' and a destination-path are mutually exclusive.\n";
print STDERR "Options '-check' and '-quiet' are mutually exclusive.\n";
exit($exit_code);
}
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index cde8204972f9..8579e67ed970 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -82,8 +82,15 @@ BEGIN
"dgo",
"kok",
"mni",
- "sat"
-
+ "sat",
+ "ug",
+ "om",
+ "si",
+ "or",
+ "oc",
+ "ml",
+ "as",
+ "ast"
);
@items_at_modules = ("Files", "Dirs", "Unixlinks");
@asianlanguages = ("ja", "ko", "zh-CN", "zh-TW");
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 991f0025e714..e9ad0c73d249 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -484,6 +484,16 @@ sub write_idt_header
push(@{$idtref}, $oneline);
}
+ if ( $definestring eq "reg64" )
+ {
+ $oneline = "Registry\tRoot\tKey\tName\tValue\tComponent_\n";
+ push(@{$idtref}, $oneline);
+ $oneline = "s72\ti2\tl255\tL255\tL0\ts72\n";
+ push(@{$idtref}, $oneline);
+ $oneline = "Reg64\tRegistry\n";
+ push(@{$idtref}, $oneline);
+ }
+
if ( $definestring eq "createfolder" )
{
$oneline = "Directory_\tComponent_\n";
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 832fd213a9f0..9f9da9485677 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -216,6 +216,27 @@ sub get_registry_value
}
##############################################################
+# Returning 64 bit value for registry table.
+##############################################################
+
+sub get_registry_val64
+{
+ my ($registry, $allvariableshashref) = @_;
+
+ my $value = "";
+
+ if ( $registry->{'Val64'} ) { $value = $registry->{'Val64'}; }
+
+ $value =~ s/\\\"/\"/g; # no more masquerading of '"'
+ $value =~ s/\<progpath\>/\[OFFICEINSTALLLOCATION\]/;
+ $value =~ s/\[OFFICEINSTALLLOCATION\]\\/\[OFFICEINSTALLLOCATION\]/; # removing "\" after "[OFFICEINSTALLLOCATION]"
+
+ if ( $value =~ /\%/ ) { $value = installer::worker::replace_variables_in_string($value, $allvariableshashref); }
+
+ return $value;
+}
+
+##############################################################
# Returning component for registry table.
##############################################################
@@ -286,8 +307,10 @@ sub create_registry_table
my $onelanguage = ${$languagesarrayref}[$m];
my @registrytable = ();
+ my @reg64table = ();
installer::windows::idtglobal::write_idt_header(\@registrytable, "registry");
+ installer::windows::idtglobal::write_idt_header(\@reg64table, "reg64");
for ( my $i = 0; $i <= $#{$registryref}; $i++ )
{
@@ -306,6 +329,7 @@ sub create_registry_table
$registry{'Key'} = get_registry_key($oneregistry, $allvariableshashref);
$registry{'Name'} = get_registry_name($oneregistry, $allvariableshashref);
$registry{'Value'} = get_registry_value($oneregistry, $allvariableshashref);
+ $registry{'Val64'} = get_registry_val64($oneregistry, $allvariableshashref);
$registry{'Component_'} = get_registry_component($oneregistry, $allvariableshashref);
# Collecting all components
@@ -343,7 +367,11 @@ sub create_registry_table
my $oneline = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
. $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n";
- push(@registrytable, $oneline);
+ my $oneline64 = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
+ . $registry{'Name'} . "\t" . $registry{'Val64'} . "\t" . $registry{'Component_'} . "\n";
+
+ if ( ! ( $style =~ /\bX64_ONLY\b/ )) { push(@registrytable, $oneline); } # standard registry table for 32 Bit
+ if (( $style =~ /\bX64\b/ ) || ( $style =~ /\bX64_ONLY\b/ )) { push(@reg64table , $oneline64); }
}
# If there are added user registry keys for files collected in
@@ -360,6 +388,11 @@ sub create_registry_table
installer::files::save_file($registrytablename ,\@registrytable);
my $infoline = "Created idt file: $registrytablename\n";
push(@installer::globals::logfileinfo, $infoline);
+
+ $registrytablename = $basedir . $installer::globals::separator . "Reg64.idt" . "." . $onelanguage;
+ installer::files::save_file($registrytablename ,\@reg64table );
+ my $infoline = "Created idt file: $registrytablename\n";
+ push(@installer::globals::logfileinfo, $infoline);
}
}
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index f18853dbdcdd..e81380807a87 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -449,6 +449,21 @@ sub get_forceintoupdate_value
}
###################################################
+# Substituting all occurences of "<" by "&lt;"
+# and all occurences of ">" by "&gt;"
+###################################################
+
+sub replace_brackets_in_string
+{
+ my ( $string ) = @_;
+
+ if ( $string =~ /\</ ) { $string =~ s/\</\&lt\;/g; }
+ if ( $string =~ /\>/ ) { $string =~ s/\>/\&gt\;/g; }
+
+ return $string;
+}
+
+###################################################
# Substituting all occurences of "\uUXYZ" by
# "&#xUXYZ;", because the use xml saxparser does
# not know anything about this encoding. Therfore
@@ -506,6 +521,7 @@ sub collect_lang_values
if ( $write_line )
{
my $value = $module->{$key};
+ $value = replace_brackets_in_string($value);
$value = replace_javaencoding_in_string($value);
my $line = $indent . "<" . $saveentry . " lang=" . "\"" . $javalanguage . "\"" . ">" . $value . "<\/" . $saveentry . ">" . "\n";
push(@{$xpdfile}, $line);
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index efee6a3e61b8..7550f86aedc5 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -85,6 +85,10 @@ common
{
MAXPROC maxproc=%MAXPROCESS%
}
+ minorext
+ {
+ UPDMINOREXT .%UPDMINOR%
+ }
nojava
{
DISABLE_JAVA TRUE
@@ -138,7 +142,7 @@ common
STL_ROOT
UPDATER
}
- order common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource
+ order minorext common:2 common:3 pro:0 pro:1 common common:0 btarget zipsource cwsname common:1 nojava shell tmp crashdump maxproc hg r_only nosource
reset
{
ALT_L10N_MODULE
@@ -178,6 +182,7 @@ common
cwsname CWS_WORK_STAMP
envroot
hg
+ minorext
nojava
nosource
pro
@@ -3486,6 +3491,7 @@ wntmsci12
WITH_VC_REDIST TRUE
XCLASSPATH .
ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+ BUILD_X64 TRUE
}
common0
{
@@ -3892,6 +3898,7 @@ wntmsci13
WITH_VC_REDIST TRUE
XCLASSPATH .
ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+ BUILD_X64 TRUE
}
common0
{
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index cce1aac0ea6e..e63b590a2e9e 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -187,6 +187,7 @@ SAXLIB=-lsax$(DLLPOSTFIX)
MAILLIB=-lmail
DOCMGRLIB=-ldmg$(DLLPOSTFIX)
BASICLIB=-lsb$(DLLPOSTFIX)
+VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
HM2LIBSH=-lhmwrpdll
HM2LIBST=-lhmwrap
@@ -220,12 +221,14 @@ JPEG3RDLIB=-ljpeg
.ELSE
JPEG3RDLIB=-ljpeglib
.ENDIF
-.IF "$(SYSTEM_NEON)" == "YES" || "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(SYSTEM_NEON)" == "YES"
+NEON3RDLIB=-lneon
+.ELIF "$(GUI)$(COM)"=="WNTGCC"
NEON3RDLIB=-lneon
.ELIF "$(OS)" == "MACOSX"
-NEON3RDLIB=$(SOLARLIBDIR)/libneon.a
+NEON3RDLIB=$(SOLARLIBDIR)/libneon.dylib
.ELSE
-NEON3RDLIB=$(STATIC) -lneon $(DYNAMIC)
+NEON3RDLIB=-lneon
.ENDIF
.IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-ldb
@@ -422,7 +425,9 @@ SAXLIB=isax.lib
MAILLIB=mail.lib
DOCMGRLIB=docmgr.lib
BASICLIB=basic.lib
+VBAHELPERLIB=vbahelper.lib
TKTLIB=tkt.lib
+SJLIB=sj.lib
SVXCORELIB=isvxcore.lib
SVXMSFILTERLIB=isvxmsfilter.lib
SVXLIB=isvx.lib
@@ -438,7 +443,7 @@ EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
ZLIB3RDLIB=zlib.lib
JPEG3RDLIB=jpeglib.lib
-NEON3RDLIB=neon.lib
+NEON3RDLIB=ineon.lib
BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b952cb5586fb..a7c1a50e911b 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=300
-RSCREVISION=300m66(Build:9460)
-BUILD=9460
-LAST_MINOR=m66
+RSCREVISION=300m67(Build:9466)
+BUILD=9466
+LAST_MINOR=m67
SOURCEVERSION=DEV300
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 3101d0a6ac01..30bb91599903 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -35,116 +35,118 @@
defaultlangiso=en-US
# Complete list of all supported ISO codes
-
-completelangiso=\
- af \
- ar \
- as-IN \
- ast \
- be-BY \
- bg \
- bn \
- bn-BD \
- bn-IN \
- br \
- brx \
- bs \
- by \
- ca \
- cs \
- cy \
- da \
- de \
- dgo \
- dz \
- el \
- en-GB \
- en-US \
- en-ZA \
- eo \
- es \
- et \
- eu \
- fa \
- fi \
- fr \
- ga \
- gd \
- gl \
- gu \
- gu-IN \
- he \
- hi-IN \
- hr \
- hu \
- is \
- it \
- ja \
- ka \
- kk \
- km \
- kn \
- ko \
- kok \
- ks \
- ku \
- lo \
- lt \
- lv \
- mai \
- mk \
- ml-IN \
- mn \
- mni \
- mr-IN \
- ms \
- my \
- nb \
- ne \
- nl \
- nn \
- nr \
- ns \
- oc \
- om \
- or-IN \
- pa-IN \
- pl \
- pt \
- pt-BR \
- ro \
- ru \
- rw \
- sa-IN \
- sat \
- sc \
- sd \
- sh \
- sk \
- sl \
- so \
- sr \
- ss \
- st \
- sv \
- sw \
- sw-TZ \
- ta-IN \
- te-IN \
- tg \
- th \
- ti-ER \
- tn \
- tr \
- ts \
- uk \
- ur-IN \
- uz \
- ve \
- vi \
- xh \
- zh-CN \
- zh-TW \
- zu
+completelangiso=af \
+ar \
+as-IN \
+be-BY \
+bo \
+bg \
+br \
+brx \
+bn \
+bn-BD \
+bn-IN \
+bs \
+by \
+ca \
+cs \
+cy \
+da \
+de \
+dgo \
+dz \
+el \
+en-GB \
+en-US \
+en-ZA \
+eo \
+es \
+et \
+eu \
+fa \
+fi \
+fr \
+ga \
+gd \
+gl \
+gu \
+gu-IN \
+he \
+hi-IN \
+hr \
+hu \
+is \
+it \
+ja \
+kid \
+ky \
+ka \
+kk \
+km \
+kn \
+ko \
+kok \
+ks \
+ku \
+lo \
+lt \
+lv \
+mai \
+mk \
+mn \
+mni \
+ms \
+ml-IN \
+mr-IN \
+my \
+ne \
+nb \
+nl \
+nn \
+nr \
+ns \
+om \
+oc \
+or-IN \
+pap \
+pa-IN \
+pl \
+ps \
+pt \
+pt-BR \
+ru \
+rw \
+sat \
+sa-IN \
+si \
+sc \
+sd \
+sk \
+sl \
+sh \
+sr \
+ss \
+st \
+sv \
+sw \
+sw-TZ \
+te-IN \
+ti-ER \
+ta-IN \
+th \
+tn \
+tr \
+ts \
+tg \
+ug \
+ur-IN \
+uk \
+uz \
+ve \
+vi \
+xh \
+zh-CN \
+zh-TW \
+zu
alllangiso=$(strip $(defaultlangiso) $(subst,$(defaultlangiso), $(uniq $(subst,ALL,$(completelangiso) $(WITH_LANG)))))
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index fb8178f7e510..23dbee21d2cd 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -46,8 +46,12 @@ LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
-USE_CFLAGS_X64+=$(CFLAGS_X64)
USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
+.IF "$(debug)"!=""
+USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
+USE_CDEFS_X64+=-DDEBUG
+.ENDIF # "$(debug)"!=""
+USE_CFLAGS_X64+=$(CFLAGS_X64)
USE_CDEFS_X64+=$(CDEFS_X64)
INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE))
@@ -85,6 +89,10 @@ LINKFLAGS_X64+= -NODEFAULTLIB -RELEASE -DEBUG -INCREMENTAL:NO
.ENDIF # "$(PRODUCT)"!="full"
MAPFILE=-out:$$@
+.IF "$(debug)" != ""
+LINKFLAGS_X64+= $(LINKFLAGSDEBUG)
+.ENDIF
+
LINKFLAGSSHLCUI_X64=/SUBSYSTEM:CONSOLE /DLL
LINKFLAGSSHL_X64=$(LINKFLAGSSHLCUI_X64)
CDEFSSLO_X64+=$(CDEFSMT_X64) $(CDEFSOBJMT_X64)
@@ -98,7 +106,7 @@ STDSLOCUI_X64=
IMPLIBFLAGS_X64=-machine:X64
LIBPATH_X64=$(PSDK)/lib/x64
-LIBPATH_VC_X64=$(PSDK)/vc/lib/x64
+LIBPATH_VC_X64=$(COMPATH)/lib/amd64
ADVAPI32LIB_X64=$(LIBPATH_X64)/advapi32.lib
SHELL32LIB_X64=$(LIBPATH_X64)/shell32.lib
@@ -182,8 +190,16 @@ DEF1TARGETN_X64=$(MISC_X64)/$(DEF1NAME_X64).def
.IF "$(DEF2NAME_X64)"!=""
DEF2TARGETN_X64=$(MISC_X64)/$(DEF2NAME_X64).def
.ENDIF
-.ENDIF # "$(BUILD_X64)"!=""
-
+$(SLO_X64)/%.obj : $(MISC_X64)/%.c
+ @echo ------------------------------
+ @echo Making: $@
+ -$(MKDIR) $(@:d)
+ @-$(MKDIR) $(MISC_X64)
+ @@-$(RM) $@
+ @$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c )
+ @$(ECHONL)
+ $(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC_X64)/$*.c )
+.ENDIF # "$(BUILD_X64)"!=""
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index def76718733e..987b81276748 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -484,16 +484,25 @@ $(SHL2IMPLIBN_X64): \
.ENDIF # "$(SHL2TARGETN_X64)"!=""
+$(SLO_X64)/%.obj : %.cpp
+ @echo ------------------------------
+ @echo Making: $@
+ @@-$(RM) $@ >& $(NULLDEV)
+ -$(MKDIR) $(@:d)
+ @-$(MKDIR) $(MISC_X64)
+ $(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cpp $(CAPTURE_OUTPUT)
$(SLO_X64)/%.obj : %.cxx
@echo Making: $@
@@-$(RM) $@ >& $(NULLDEV)
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
+ $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
$(COMMAND_ECHO)$(CAPTURE_COMMAND) $(CXX_X64) $(USE_CFLAGS_X64) $(INCLUDE_X64) $(CFLAGSCXX_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(CFLAGSINCXX)$(PWD)/$*.cxx $(CAPTURE_OUTPUT)
$(SLO_X64)/%.obj : $(MISC)/%.c
@echo Making: $@
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
+ $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
@@-$(RM) $@
@$(TYPE) $(mktmp $(CC_X64) $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $(MISC)/$*.c )
@$(ECHONL)
@@ -502,9 +511,8 @@ $(SLO_X64)/%.obj : $(MISC)/%.c
$(SLO_X64)/%.obj : %.c
@echo Making: $@
$(COMMAND_ECHO)-$(MKDIR) $(@:d)
+ $(COMMAND_ECHO)@-$(MKDIR) $(MISC_X64)
@@-$(RM) $@
$(COMMAND_ECHO)$(CC_X64) @$(mktmp $(USE_CFLAGS_X64) $(INCLUDE_C) $(CFLAGSCC_X64) $(CFLAGSSLO_X64) $(USE_CDEFS_X64) $(CDEFSSLO_X64) $(CDEFSMT_X64) $(CFLAGSAPPEND_X64) $(CFLAGSOUTOBJ)$(SLO_X64)/$*.obj $*.c )
.ENDIF # "$(BUILD_X64)"!=""
-
-BUILD64=1
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 10:54:49 +0000