Commit 77685925 authored by claes's avatar claes

*** empty log message ***

parent 69394212
...@@ -840,6 +840,7 @@ pwrc_set_func() ...@@ -840,6 +840,7 @@ pwrc_set_func()
export pwrp_lis=$pwrp_root/$platform/lis export pwrp_lis=$pwrp_root/$platform/lis
export PATH=$PATH:$pwrp_exe export PATH=$PATH:$pwrp_exe
export CDPATH=$pwrp_root:$pwrp_root/common:$pwrp_root/x86_linux:$pwrp_src
export pwrp_projectname=$pname export pwrp_projectname=$pname
......
...@@ -33,6 +33,16 @@ then ...@@ -33,6 +33,16 @@ then
ar rc $pwrp_lib/${arname_pict} ar rc $pwrp_lib/${arname_pict}
fi fi
#link option file exists and is not empty
if [ -s $pwrp_exe/ra_rtt.opt ]; then
ld_opt_tmp="`cat $pwrp_exe/ra_rtt.opt`"
ld_opt="`eval echo $ld_opt_tmp`"
else
ld_opt=""
fi
cc=gcc cc=gcc
cinc="-I$pwr_inc -I$pwrp_rttbld -I-" cinc="-I$pwr_inc -I$pwrp_rttbld -I-"
cflags="-DOS_LINUX=1 -DOS=linux -DHW_X86=1 -DHW=x86 -O3 -DGNU_SOURCE -DPWR_NDEBUG -D_REENTRANT" cflags="-DOS_LINUX=1 -DOS=linux -DHW_X86=1 -DHW=x86 -O3 -DGNU_SOURCE -DPWR_NDEBUG -D_REENTRANT"
...@@ -47,6 +57,7 @@ then ...@@ -47,6 +57,7 @@ then
${ld} ${linkflags} -o $pwrp_exe/${exename} $pwrp_obj/${menuname}.o \ ${ld} ${linkflags} -o $pwrp_exe/${exename} $pwrp_obj/${menuname}.o \
$pwr_obj/dtt_rttsys.o $pwr_obj/rt_io_user.o \ $pwr_obj/dtt_rttsys.o $pwr_obj/rt_io_user.o \
$pwrp_lib/${arname_pict} $pwrp_lib/${arname} \ $pwrp_lib/${arname_pict} $pwrp_lib/${arname} \
$ld_opt \
-lpwr_dtt\ -lpwr_dtt\
-lpwr_rt -lpwr_co -lpwr_msg_dummy -lrpcsvc -lpthread -lm -lposix1b -lrt -lpwr_rt -lpwr_co -lpwr_msg_dummy -lrpcsvc -lpthread -lm -lposix1b -lrt
fi fi
......
...@@ -45,22 +45,22 @@ ...@@ -45,22 +45,22 @@
# define SET_VERSION(a, b, c, d) ((pwr_tVersion)((a << 24) + (a << 16) + (a << 8) + a)) # define SET_VERSION(a, b, c, d) ((pwr_tVersion)((a << 24) + (a << 16) + (a << 8) + a))
#endif #endif
#define pwrv_cBuildTimeStr "15 Dec 2000" #define pwrv_cBuildTimeStr "24 Nov 2003"
#define pwrv_cPwrVersionStr "V3.9.0" #define pwrv_cPwrVersionStr "V4.0.0"
#define pwrv_cPwrVersion SET_VERSION('V', 3, 9, 0) #define pwrv_cPwrVersion SET_VERSION('V', 4, 0, 0)
#define pwrv_cSmdVersion SET_VERSION('V', 3, 9, 0) #define pwrv_cSmdVersion SET_VERSION('V', 4, 0, 0)
#define pwrv_cSmdVersionStr "V3.9.0" #define pwrv_cSmdVersionStr "V3.9.0"
#define pwrv_cBmdVersion SET_VERSION('V', 3, 9, 0) #define pwrv_cBmdVersion SET_VERSION('V', 4, 0, 0)
#define pwrv_cBmdVersionStr "V3.9.0" #define pwrv_cBmdVersionStr "V4.0.0"
#define pwrv_cWbdbVersion SET_VERSION('V', 3, 9, 0) #define pwrv_cWbdbVersion SET_VERSION('V', 4, 0, 0)
#define pwrv_cWbdbVersionStr "V3.9.0" #define pwrv_cWbdbVersionStr "V4.0.0"
#define pwrv_cWbdbVersionShortStr "V39" #define pwrv_cWbdbVersionShortStr "V40"
#define pwrv_cLffVersion SET_VERSION('V', 3, 9, 0) #define pwrv_cLffVersion SET_VERSION('V', 4, 0, 0)
#define pwrv_cLffVersionStr "V3.9.0" #define pwrv_cLffVersionStr "V4.0.0"
#endif #endif
...@@ -370,7 +370,7 @@ link_io_base_areas ( ...@@ -370,7 +370,7 @@ link_io_base_areas (
dlink_area((plc_sDlink *)&pp->base.di_a, "pwrNode-active-io-di", pp->IOHandler->DiCount * sizeof(pwr_tBoolean)); dlink_area((plc_sDlink *)&pp->base.di_a, "pwrNode-active-io-di", pp->IOHandler->DiCount * sizeof(pwr_tBoolean));
dlink_area((plc_sDlink *)&pp->base.do_a, "pwrNode-active-io-do", pp->IOHandler->DoCount * sizeof(pwr_tBoolean)); dlink_area((plc_sDlink *)&pp->base.do_a, "pwrNode-active-io-do", pp->IOHandler->DoCount * sizeof(pwr_tBoolean));
dlink_area((plc_sDlink *)&pp->base.dv_a, "pwrNode-active-io-dv", pp->IOHandler->DvCount * sizeof(pwr_tBoolean)); dlink_area((plc_sDlink *)&pp->base.dv_a, "pwrNode-active-io-dv", pp->IOHandler->DvCount * sizeof(pwr_tBoolean));
dlink_area((plc_sDlink *)&pp->base.av_i, "pwrNode-active-io-av_init", pp->IOHandler->DvCount * sizeof(pwr_tInt32)); dlink_area((plc_sDlink *)&pp->base.av_i, "pwrNode-active-io-av_init", pp->IOHandler->AvCount * sizeof(pwr_tFloat32));
dlink_area((plc_sDlink *)&pp->base.dv_i, "pwrNode-active-io-dv_init", pp->IOHandler->DvCount * sizeof(pwr_tInt32)); dlink_area((plc_sDlink *)&pp->base.dv_i, "pwrNode-active-io-dv_init", pp->IOHandler->DvCount * sizeof(pwr_tInt32));
} }
......
...@@ -195,6 +195,13 @@ $(exe_dir)/%.gif : %.gif ...@@ -195,6 +195,13 @@ $(exe_dir)/%.gif : %.gif
@ $(log_h_h) @ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target) @ $(cp) $(cpflags) $(source) $(target)
$(doc_dir)/orm/%.gif : %.gif
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
$(doc_dir)/%.gif : %.gif
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
$(cnf_dir)/%.wb_vers : %.wb_load $(cnf_dir)/%.wb_vers : %.wb_load
@ $(log_wb_load_wb_vers) @ $(log_wb_load_wb_vers)
...@@ -213,4 +220,8 @@ $(exe_dir)/%.html : ../../%.html ...@@ -213,4 +220,8 @@ $(exe_dir)/%.html : ../../%.html
@ $(log_h_h) @ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target) @ $(cp) $(cpflags) $(source) $(target)
$(doc_dir)/%.html : ../../%.html
@ $(log_h_h)
@ $(cp) $(cpflags) $(source) $(target)
endif endif
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