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

build-howto.info

@@ -36,8 +36,8 @@ g++
 libgtk2.0-dev
 cpp
 libasound2-dev
-libdb5.1-dev
-libdb5.1++-dev
+libdb5.3-dev
+libdb5.3++-dev
 doxygen
 
 qt4-dev-tools
@@ -52,8 +52,8 @@ libsqlite3-dev              History database with sqlite
 libhdf5-openmpi-dev         History database with hdf5
 libusb-1.0.0-dev            USB I/O cards (Velleman)
 librsvg2-dev                SVG image support in Ge
-libgstreamer0.10-dev        Network video camera
-libgstreamer-plugins-base0.10-dev Network video camera
+libgstreamer1.0-dev        Network video camera
+libgstreamer-plugins-base1.0-dev Network video camera
 openPOWERLINK-V1.08.2       Ethernet Powerlink zip-file. Build from sources.
 libpcap-dev                 Ethernet Powerlink
 

src/exe/co_convert/src/cnv_classdep.cpp

@@ -63,6 +63,7 @@ int CnvClassDep::read()
   int currentidx = 0;
 
   sprintf(fname, "$pwre_broot/$pwre_target/bld/wbl/*.cdp");
+  str_ToLower(fname, fname);
   // dcli_translate_filename( fname, fname);
 
   // Create root;

src/exe/co_convert/src/cnv_wbltops.cpp

@@ -63,6 +63,7 @@ int CnvWblToPs::init(char* first)
   } else {
     strcat(fname, ".ps");
   }
+  str_ToLower(fname, fname);
 
   if (ctx->generate_pdf) {
     tops->set_filename(ps_eFile_Body, fname);

src/exe/co_convert/src/cnv_wbltoxtthelp.cpp

@@ -103,6 +103,7 @@ int CnvWblToXtthelp::init(char* first)
   strcpy(fname, ctx->dir);
   strcat(fname, ctx->rw->volume_name);
   strcat(fname, "_xtthelp.dat");
+  str_ToLower(fname, fname);
 
   fp_xtthelp_index.open(fname);
 

src/tools/bld/src/os_linux/hw_arm/variables.mk

@@ -116,10 +116,10 @@ log_done	=
 #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
 csetos 		:= $(pwre_conf_cc_define)
-ifeq ($(flavour),gtk)
-  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)
+ifeq ($(flavour),qt)
+  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
-  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
 rm		:= rm
 cp		:= cp

xtt/lib/cow/gtk/cow_rtmon_gtk.cpp

@@ -338,7 +338,7 @@ static gboolean rtmon_scan(void* data)
         strcpy(color_name, "Yellow");
         strcpy(text, "Running");
       } else {
-        strcpy(color_name, "Green");
+        strcpy(color_name, "Lightgreen");
         strcpy(text, "Running");
       }
       gtk_widget_set_sensitive(rtmon->bbox_start, FALSE);