Commit 33d3ff6b authored by claes's avatar claes

Merge branch 'master' of https://github.com/siamect/proview

parents d5bf4ed0 11d04ede
...@@ -36,8 +36,8 @@ g++ ...@@ -36,8 +36,8 @@ g++
libgtk2.0-dev libgtk2.0-dev
cpp cpp
libasound2-dev libasound2-dev
libdb5.1-dev libdb5.3-dev
libdb5.1++-dev libdb5.3++-dev
doxygen doxygen
qt4-dev-tools qt4-dev-tools
...@@ -52,8 +52,8 @@ libsqlite3-dev History database with sqlite ...@@ -52,8 +52,8 @@ libsqlite3-dev History database with sqlite
libhdf5-openmpi-dev History database with hdf5 libhdf5-openmpi-dev History database with hdf5
libusb-1.0.0-dev USB I/O cards (Velleman) libusb-1.0.0-dev USB I/O cards (Velleman)
librsvg2-dev SVG image support in Ge librsvg2-dev SVG image support in Ge
libgstreamer0.10-dev Network video camera libgstreamer1.0-dev Network video camera
libgstreamer-plugins-base0.10-dev Network video camera libgstreamer-plugins-base1.0-dev Network video camera
openPOWERLINK-V1.08.2 Ethernet Powerlink zip-file. Build from sources. openPOWERLINK-V1.08.2 Ethernet Powerlink zip-file. Build from sources.
libpcap-dev Ethernet Powerlink libpcap-dev Ethernet Powerlink
......
...@@ -63,6 +63,7 @@ int CnvClassDep::read() ...@@ -63,6 +63,7 @@ int CnvClassDep::read()
int currentidx = 0; int currentidx = 0;
sprintf(fname, "$pwre_broot/$pwre_target/bld/wbl/*.cdp"); sprintf(fname, "$pwre_broot/$pwre_target/bld/wbl/*.cdp");
str_ToLower(fname, fname);
// dcli_translate_filename( fname, fname); // dcli_translate_filename( fname, fname);
// Create root; // Create root;
......
...@@ -63,6 +63,7 @@ int CnvWblToPs::init(char* first) ...@@ -63,6 +63,7 @@ int CnvWblToPs::init(char* first)
} else { } else {
strcat(fname, ".ps"); strcat(fname, ".ps");
} }
str_ToLower(fname, fname);
if (ctx->generate_pdf) { if (ctx->generate_pdf) {
tops->set_filename(ps_eFile_Body, fname); tops->set_filename(ps_eFile_Body, fname);
......
...@@ -103,6 +103,7 @@ int CnvWblToXtthelp::init(char* first) ...@@ -103,6 +103,7 @@ int CnvWblToXtthelp::init(char* first)
strcpy(fname, ctx->dir); strcpy(fname, ctx->dir);
strcat(fname, ctx->rw->volume_name); strcat(fname, ctx->rw->volume_name);
strcat(fname, "_xtthelp.dat"); strcat(fname, "_xtthelp.dat");
str_ToLower(fname, fname);
fp_xtthelp_index.open(fname); fp_xtthelp_index.open(fname);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -116,10 +116,10 @@ log_done = ...@@ -116,10 +116,10 @@ log_done =
#csetos := -DOS_LINUX=1 -DOS=linux -D_LINUX -DHW_ARM=1 -DHW=ARM #csetos := -DOS_LINUX=1 -DOS=linux -D_LINUX -DHW_ARM=1 -DHW=ARM
#cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I$(jdk)/include -I$(jdk)/include/linux #cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) -I$(jdk)/include -I$(jdk)/include/linux
csetos := $(pwre_conf_cc_define) csetos := $(pwre_conf_cc_define)
ifeq ($(flavour),gtk) ifeq ($(flavour),qt)
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst) cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
else else
cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirqt) cinc := -I$(inc_dir) -I$(einc_dir) -I$(hw_source) -I$(os_source) -I$(co_source) $(pwre_conf_incdir) $(pwre_conf_incdirgtk) $(pwre_conf_incdirgst)
endif endif
rm := rm rm := rm
cp := cp cp := cp
......
This diff is collapsed.
...@@ -338,7 +338,7 @@ static gboolean rtmon_scan(void* data) ...@@ -338,7 +338,7 @@ static gboolean rtmon_scan(void* data)
strcpy(color_name, "Yellow"); strcpy(color_name, "Yellow");
strcpy(text, "Running"); strcpy(text, "Running");
} else { } else {
strcpy(color_name, "Green"); strcpy(color_name, "Lightgreen");
strcpy(text, "Running"); strcpy(text, "Running");
} }
gtk_widget_set_sensitive(rtmon->bbox_start, FALSE); gtk_widget_set_sensitive(rtmon->bbox_start, FALSE);
......
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