Commit 20591e99 authored by Christoffer Ackelman's avatar Christoffer Ackelman

Proview can now be compiled in parallel.

parent be52d667
......@@ -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
......
......@@ -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)
......
......@@ -1460,11 +1460,16 @@ sub _build () # args: branch, subbranch, flavour, phase
if ($hw eq "x86" && $real_hw eq "x86_64") {
$ENV{"cross_compile"} = "-m32";
}
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;
}
}
}
}
}
}
#
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment