Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
20591e99
Commit
20591e99
authored
Sep 07, 2018
by
Christoffer Ackelman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Proview can now be compiled in parallel.
parent
be52d667
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
src/lib/dtt/src/os_templ/hw_templ/makefile
src/lib/dtt/src/os_templ/hw_templ/makefile
+2
-0
src/tools/bld/src/os_linux/rules.mk
src/tools/bld/src/os_linux/rules.mk
+7
-6
src/tools/pwre/src/os_linux/pwre.pl
src/tools/pwre/src/os_linux/pwre.pl
+6
-1
No files found.
src/lib/dtt/src/os_templ/hw_templ/makefile
View file @
20591e99
...
...
@@ -99,6 +99,8 @@ source_dependencies := $(addsuffix $(d_ext), $(source_dependencies))
lib_name
=
libpwr_
$(comp_name)
export_lib
=
$(lib_dir)
/
$(lib_name)$(lib_ext)
.NOTPARALLEL
:
.PHONY
:
all init copy lib exe $(clean realclean
\
dirs $(clean_h_includes) $(clean_hpp_includes)
\
clean_bld clean_dirs clean_lib export_stuff
...
...
src/tools/bld/src/os_linux/rules.mk
View file @
20591e99
...
...
@@ -102,22 +102,23 @@ endif
@
$(log_c_obj)
@
$(cxx)
$(cxxflags)
$(csetos)
$(cinc)
$(cobj)
$(source)
$(bld_dir)/%_moc.o
:
%.cqt
@
echo
"Generating ../../
$(sname)
_moc.cpp from ../../
$(sname)
.h using moc"
@
moc
$(csetos)
$(cinc)
../../
$(sname)
.h
\
-o
$(bld_dir)
/
$(sname)
_moc.cpp
@
echo
"Compiling ../../
$(sname)
_moc.cpp"
@
$(cxx)
$(cxxflags)
$(csetos)
$(cinc)
-o
$(bld_dir)
/
$(sname)
_moc.o
$(bld_dir)
/
$(sname)
_moc.cpp
$(bld_dir)/%.o
:
%.cqt
ifeq
($(nodep),)
@
$(log_c_d)
@
$(SHELL)
-ec
'
$(cxx)
-x c++ -MM
$(csetos)
$(cinc)
$(source)
\
| sed '
\'
's|$*\.o[ ]*|
$(bld_dir)
/&|g'
\'
' >
$(bld_dir)
/
$(sname)
.d'
endif
@
echo
"Generating ../../
$(sname)
_moc.cpp from ../../
$(sname)
.h using moc"
@
moc
$(csetos)
$(cinc)
../../
$(sname)
.h
\
-o
$(bld_dir)
/
$(sname)
_moc.cpp
@
echo
"Compiling ../../
$(sname)
_moc.cpp"
@
$(cxx)
$(cxxflags)
$(csetos)
$(cinc)
-o
$(bld_dir)
/
$(sname)
_moc.o
$(bld_dir)
/
$(sname)
_moc.cpp
@
$(cp)
$(cpflags)
$(source)
$(bld_dir)
/
$(sname)
.cpp
@
$(log_c_obj)
@
$(cxx)
$(cxxflags)
$(csetos)
$(cinc)
$(cobj)
$(bld_dir)
/
$(sname)
.cpp
$(bld_dir)/%.o
:
$(tmp_dir)/%.cpp
ifeq
($(nodep),)
@
$(log_c_d)
...
...
src/tools/pwre/src/os_linux/pwre.pl
View file @
20591e99
...
...
@@ -1460,7 +1460,12 @@ sub _build () # args: branch, subbranch, flavour, phase
if
(
$hw
eq
"
x86
"
&&
$real_hw
eq
"
x86_64
")
{
$ENV
{"
cross_compile
"}
=
"
-m32
";
}
system
("
make
@_
")
&&
exit
1
;
if
(
$branch
eq
"
lib
"
||
(
$branch
eq
"
exe
"
&&
$flavour
ne
"
src
"))
{
# All libraries and GUI-exe files can be compiled in parallel
system
("
make -j
@_
")
&&
exit
1
;
}
else
{
system
("
make
@_
")
&&
exit
1
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment