strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS ause120

Browse source
This commit is contained in:
obo 2010-06-14 16:56:41 +02:00
commit 4563f82676
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
solenv/bin/mhids.pl
View file

@ -203,8 +203,8 @@ if ( $ret ) {
}
push @cleanuplist, ".c1";
print "$compiler $solarincludes $defs $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2\n" if $verbose;
$ret = system "$compiler $solarincludes $defs $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2";
print "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2\n" if $verbose;
$ret = system "$compiler $defs $solarincludes $preprocess_flag ${shell_workfile}.c1 > ${shell_workfile}.c2";
if ( $ret ) {
push @cleanuplist, ".c2";
cleandie("ERROR - calling compiler for preprocessing failed");
@ -246,8 +246,8 @@ if ( $outobj_flag ne "" )
{
$outobj_param = "$outobj_flag${shell_workfile}$objext";
}
print "$compiler $solarincludes $defs ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n" if $verbose;
$ret = system "$compiler $solarincludes $defs ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext";
print "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext \n" if $verbose;
$ret = system "$compiler $defs $solarincludes ${shell_workfile}.c $outobj_param $outbin_flag${shell_workfile}$appext";
if ( $ret ) {
push @cleanuplist, "$appext";
cleandie("ERROR - compiling $workfile.c failed");

2
soltools/prj/build.lst
View file

@ -1,4 +1,4 @@
so soltools : SUN:so_prereq NULL
so soltools : solenv SUN:so_prereq NULL
so soltools usr1 - all so_usr1 NULL
so soltools\inc get - all so_inc NULL
so soltools\ldump nmake - all so_ldump so_mkdep NULL

4
soltools/util/makefile.pmk Normal file → Executable file
View file

@ -34,6 +34,10 @@ ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility
# avoid STLPort
NO_DEFAULT_STL=TRUE
SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC))
.IF "$(STLPORT4)" != ""
SOLARINC!:=$(subst,$(STLPORT4)/include/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
SOLARINC!:=$(subst,$(STLPORT4)/stlport,dont_use_stl$(SPACECHAR) $(SOLARINC))
.ENDIF
.IF "$(OS)"=="SOLARIS"
# hack due to #i53089#