diff --git a/Makefile b/Makefile index bf912d2..06658c1 100644 --- a/Makefile +++ b/Makefile @@ -125,6 +125,9 @@ buildwindows: clean mv *.dll SimpleSkyCam-$(VERSION)/ mv share SimpleSkyCam-$(VERSION)/ cp /usr/lib/gcc/x86_64-w64-mingw32/12-win32/*.dll SimpleSkyCam-$(VERSION)/ + cp /opt/W64-cross-compile/lib/libtiff4.dll SimpleSkyCam-$(VERSION)/libtiff-6.dll + cp /opt/W64-cross-compile/lib/SVBCamera* SimpleSkyCam-$(VERSION)/ + packwindows: rm -rf SimpleSkyCam-$(VERSION) *.bz2 @@ -135,7 +138,7 @@ packwindows: cp ChangeLog SimpleSkyCam-$(VERSION)/ cp LICENSE SimpleSkyCam-$(VERSION)/ for i in `ldd simpleskycam.exe |grep -vi "/c/windows" | cut -d" " -f3`; do cp $$i SimpleSkyCam-$(VERSION)/; done - tar cvohif SimpleSkyCam-0.0.1-win64.tar.bz2 SimpleSkyCam-0.0.1/ + tar cvohif SimpleSkyCam-0.0.1-win64.tar.bz2 SimpleSkyCam-0.0.1/ $(TARGET): $(OBJECTS) $(CPP) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(LIBS) diff --git a/posctl.cc b/posctl.cc index af0a733..ad07540 100644 --- a/posctl.cc +++ b/posctl.cc @@ -146,6 +146,8 @@ void cb_posctl_change_entry (GtkWidget *widget, gpointer data) { GtkWidget *a2_kp = GTK_WIDGET(gtk_builder_get_object (GTK_BUILDER(_builder_), "posctl_entry_a2_kp")); GtkWidget *a2_ki = GTK_WIDGET(gtk_builder_get_object (GTK_BUILDER(_builder_), "posctl_entry_a2_ki")); GtkWidget *a2_kd = GTK_WIDGET(gtk_builder_get_object (GTK_BUILDER(_builder_), "posctl_entry_a2_kd")); + GtkWidget *resetsim = GTK_WIDGET(gtk_builder_get_object (GTK_BUILDER(_builder_), "posctl_btn_resetsim")); + const char *s; posctl.GetAxisParam(0, &a1min, &a1max, &a1p, &a1i, &a1d); @@ -153,6 +155,8 @@ void cb_posctl_change_entry (GtkWidget *widget, gpointer data) { printf ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__); s = gtk_entry_get_text(GTK_ENTRY(widget)); + if (strncmp(s, "SIMULATION", 11) == 0) gtk_widget_show (resetsim); + else gtk_widget_hide (resetsim); posctl.LockMutex(); if (e_posdevice == widget) posctl.SetDevice(s);