chg: Makefile updated to build in any plataform !minor

lcgamboa · May 26, 2024 · 1524251 · 1524251
1 parent 3b841c0
commit 1524251
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/src/Makefile.static b/src/Makefile.static
@@ -30,7 +30,7 @@ override CXXFLAGS+= -DEXT_BROWSER -flto=auto
 
 
 LIBS=  $(LIBPATH)/picsim/src/libpicsim.a $(LIBPATH)/lxrad/lib/liblxrad.a \
-       $(LIBPATH)/simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a \
+       $(LIBPATH)/simavr/simavr/obj-${shell $(CC) -dumpmachine}/libsimavr.a \
        $(LIBPATH)/lunasvg/build/liblunasvg.a \
        $(LIBPATH)/uCsim_picsimlab/picsimlab/libucsim.a \
       -lopenal `wx-config --libs` `wx-config --libs stc` -ldl -lgpsim

diff --git a/src/parts/other_jumpers.cc b/src/parts/other_jumpers.cc
@@ -527,26 +527,30 @@ void cpart_Jumpers::Process(void) {
     const picpin* ppins = SpareParts.GetPinsValues();
 
     for (i = 0; i < 16; i++) {
-        if (ppins[input_pins[i] - 1].value != ppins[output_pins[i] - 1].value) {
-            if (jtype & 0x01) {
-                SpareParts.SetPin(output_pins[i], ppins[input_pins[i] - 1].value);
-            } else {
-                SpareParts.WritePin(output_pins[i], ppins[input_pins[i] - 1].value);
+        if (input_pins[i] && output_pins[i]) {
+            if (ppins[input_pins[i] - 1].value != ppins[output_pins[i] - 1].value) {
+                if (jtype & 0x01) {
+                    SpareParts.SetPin(output_pins[i], ppins[input_pins[i] - 1].value);
+                } else {
+                    SpareParts.WritePin(output_pins[i], ppins[input_pins[i] - 1].value);
+                }
             }
+            /*
+            if (ppins[input_pins[i] - 1].avalue != ppins[output_pins[i] - 1].avalue)
+            {
+                SpareParts.WritePinA (output_pins[i], ppins[input_pins[i] - 1].avalue);
+            }
+             */
         }
-        /*
-        if (ppins[input_pins[i] - 1].avalue != ppins[output_pins[i] - 1].avalue)
-        {
-     SpareParts.WritePinA (output_pins[i], ppins[input_pins[i] - 1].avalue);
-        }
-         */
     }
 
     mcount++;
     if (mcount >= JUMPSTEPS_) {
         for (i = 0; i < 16; i++) {
-            if (ppins[output_pins[i] - 1].value)
-                output_pins_alm[i]++;
+            if (output_pins[i]) {
+                if (ppins[output_pins[i] - 1].value)
+                    output_pins_alm[i]++;
+            }
         }
         mcount = -1;
     }

diff --git a/src/picsimlab5.cc b/src/picsimlab5.cc
@@ -167,7 +167,8 @@ void CPWindow5::pmenu2_Properties_EvMenuActive(CControl* control) {
         Application->ACreateWindow(Windows[PW_WPROP]);
         Windows[PW_WPROP]->HideExclusive();
         Windows[PW_WPROP]->DestroyChilds();
-        Windows[PW_WPROP]->SetTitle(SpareParts.GetPart(PartSelected)->GetName());
+        Windows[PW_WPROP]->SetTitle(SpareParts.GetPart(PartSelected)->GetName() +
+                                    " [id=" + std::to_string(SpareParts.GetPart(PartSelected)->GetId()) + "]");
         Windows[PW_WPROP]->SetWidth(370);
         Windows[PW_WPROP]->SetX(SpareParts.GetPart(PartSelected)->GetX() + GetX() - offsetx);
         Windows[PW_WPROP]->SetY(SpareParts.GetPart(PartSelected)->GetY() + GetY() - offsety);