chg: makefiles updated !minor

src/Makefile

@@ -18,10 +18,8 @@ override CFLAGS+= -D_VERSION_=\"$(VERSION)\" -Wall -g -O2 -D_SHARE_=\"${sharedir
 override CFLAGS+= -DEXT_BROWSER
 #override CFLAGS+=-fsanitize=address
 
-ELIBS_= $(addsuffix .a ,$(ELIBS))
 
-LIBS = `lxrad-config --libs` -lpicsim -lsimavr -lelf
-LIBS+= $(ELIBS_)
+LIBS = $(ELIBS) `lxrad-config --libs` -lpicsim -lsimavr -lelf
 #LIBS=  ../../picsim/src/libpicsim_dbg.a ../../LXRAD_WX/libteste/liblxrad.a  ../../simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a\
       -lopenal `wx-config --libs` `wx-config --libs stc` 
 

src/Makefile.Common

@@ -24,9 +24,8 @@ OBJS_EXP =  boards/board_MPLAB_Xpress.o boards/board_Curiosity.o boards/board_x.
 .PHONY: exp 
 
 exp: OBJS+=$(OBJS_EXP)  
-exp: EFLAGS=-D_EXPERIMENTAL_
-#static libraries without suffix	
-exp: ELIBS= ../ucsim/picsimlab/libucsim
+exp: EFLAGS=-D_EXPERIMENTAL_ 
+exp: ELIBS= -lucsim
 
 exp: $(OBJS_EXP) all
 	

src/Makefile.JS

@@ -14,11 +14,11 @@ execdir= ${prefix}/bin/
 
 #lxrad automatic generated block start, don't edit below!
 
-override CFLAGS=  -DEXT_BROWSER -DNO_DEBUG -DNO_TOOLS -Werror -Os -s DEMANGLE_SUPPORT=0 \
+override CFLAGS+=  -DEXT_BROWSER -DNO_DEBUG -DNO_TOOLS -Werror -Os -s DEMANGLE_SUPPORT=0 \
         -s SAFE_HEAP=0 -s ASSERTIONS=0 -s TOTAL_MEMORY=128MB -s USE_SDL=2 -s USE_SDL_IMAGE=2 \
 	-s SDL2_IMAGE_FORMATS='["png","bmp"]' -s USE_SDL_TTF=2 --preload-file assets --preload-file home \
 	-D_VERSION_=\"${VERSION}\" -Wall -D_SHARE_=\"/assets/share/\" -I../../LXRAD_SDL2/include/ \
-	-I../../picsim/include/ \
+	-I../../picsim/include/  -I../../ucsim-0.6/picsimlab/\
 	-I../../simavr/simavr/ -DEXT_BROWSER_EXAMPLES   
 override CFLAGS+= --pre-js load.js
 #	-s "BINARYEN_TRAP_MODE='clamp'" 
@@ -32,7 +32,7 @@ CFLAGS+= -D_NOTHREAD
 
 LIBS= ../../LXRAD_SDL2/lib/liblxrad_SDL2_js.a ../../picsim/src/libpicsim_js.a ../../simavr/simavr/obj-wasm32-unknown-emscripten/libsimavr.a
 LIBS+= ../../LXRAD_SDL2/teste/zlib-master/contrib/minizip/minizip.a
-LIBS+= $(ELIBS)
+LIBS+= ../../ucsim-0.6/picsimlab/libucsim.ajs
 
 #LIBS = `lxrad_SDL2-config --libs` -lpicsim -lsimavr -lelf
 

src/Makefile.JSMT

@@ -14,7 +14,7 @@ execdir= ${prefix}/bin/
 
 #lxrad automatic generated block start, don't edit below!
 
-override CFLAGS=  -DEXT_BROWSER -DNO_DEBUG -DNO_TOOLS -Werror -Os  -s DEMANGLE_SUPPORT=0 \
+override CFLAGS+=  -DEXT_BROWSER -DNO_DEBUG -DNO_TOOLS -Werror -Os  -s DEMANGLE_SUPPORT=0 \
         -s SAFE_HEAP=0 -s ASSERTIONS=0 -s TOTAL_MEMORY=128MB -s USE_SDL=2 -s USE_SDL_IMAGE=2 \
 	-s SDL2_IMAGE_FORMATS='["png","bmp"]' -s USE_SDL_TTF=2 --preload-file assets --preload-file home \
 	-D_VERSION_=\"${VERSION}\" -Wall -D_SHARE_=\"/assets/share/\" -I../../LXRAD_SDL2/include/ \
@@ -31,7 +31,7 @@ override CFLAGS+= -s WASM=1  -s USE_PTHREADS=1 -s PTHREAD_POOL_SIZE=1
 
 LIBS= ../../LXRAD_SDL2/lib/liblxrad_SDL2_js_mt.a ../../picsim/src/libpicsim_js_mt.a ../../simavr/simavr/obj-wasm32-unknown-emscripten_mt/libsimavr_mt.a
 LIBS+= ../../LXRAD_SDL2/teste/zlib-master/contrib/minizip/minizip_mt.a
-LIBS+= $(ELIBS)
+LIBS+= ../../ucsim-0.6/picsimlab/libucsim.ajsmt
 
 #LIBS = `lxrad_SDL2-config --libs` -lpicsim -lsimavr -lelf
 

src/Makefile.SDL2

@@ -19,8 +19,7 @@ override CFLAGS += -DEXT_BROWSER  -D_VERSION_=\"${VERSION}\" -Wall -ggdb -D_SHAR
 override CFLAGS+=-fsanitize=address
 override CFLAGS+= -D_NOTHREAD
 
-LIBS = `lxrad_SDL2-config --libs` -lpicsim -lsimavr -lelf -lminizip
-LIBS+= $(ELIBS)
+LIBS = $(ELIBS) `lxrad_SDL2-config --libs` -lpicsim -lsimavr -lelf -lminizip
 
 #lxrad automatic generated block end, don't edit above!
 

src/Makefile.X11

@@ -20,10 +20,9 @@ override CFLAGS += -DEXT_BROWSER -D_VERSION_=\"${VERSION}\" -Wall -g -O2  -D_SHA
 #override CFLAGS+= -D_NOTHREAD
 #override CFLAGS+=-fsanitize=address
 
-ELIBS_= $(addsuffix .a ,$(ELIBS))
 
-#LIBS = $(ELIBS_) `lxrad_X11-config --libs` -lpicsim -lsimavr -lelf -lminizip
-LIBS = $(ELIBS_) `lxrad_X11-config --libs`  ../../picsim/src/libpicsim_dbg.a  ../../simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a -lelf -lminizip
+#LIBS = $(ELIBS) `lxrad_X11-config --libs` -lpicsim -lsimavr -lelf -lminizip
+LIBS = $(ELIBS) `lxrad_X11-config --libs`  ../../picsim/src/libpicsim_dbg.a  ../../simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a -lelf -lminizip
 
 #lxrad automatic generated block end, don't edit above!
 

src/Makefile.cross

@@ -9,9 +9,7 @@ override CFLAGS+= -DEXT_BROWSER
 override CFLAGS+=-I../dev_w64/lib/wx/include/x86_64-w64-mingw32-msw-unicode-3.1 -I../dev_w64/include/wx-3.1 -D_FILE_OFFSET_BITS=64 -DWXUSINGDLL -D__WXMSW__
 #CFLAGS+=`x86_64-w64-mingw32-msw-unicode-3.1  --cxxflags` 
 
-ELIBS_= $(addsuffix .aw ,$(ELIBS))
-
-LIBS= $(ELIBS_) -llxrad -lOpenAL32 -lpicsim  -lsimavr -lws2_32 -L../dev_w64/lib
+LIBS= $(ELIBS) -llxrad -lOpenAL32 -lpicsim  -lsimavr -lws2_32 -L../dev_w64/lib
 LIBS+= -Wl,--subsystem,windows -mwindows 
 #LIBS+= -Wl,--subsystem,console -mconsole 
 LIBS+=-lwx_mswu_xrc-3.1-x86_64-w64-mingw32 -lwx_mswu_html-3.1-x86_64-w64-mingw32 -lwx_mswu_qa-3.1-x86_64-w64-mingw32 -lwx_mswu_core-3.1-x86_64-w64-mingw32 -lwx_baseu_xml-3.1-x86_64-w64-mingw32 -lwx_baseu_net-3.1-x86_64-w64-mingw32 -lwx_baseu-3.1-x86_64-w64-mingw32 

src/Makefile.cross_32

@@ -10,9 +10,7 @@ override CFLAGS+= -I../dev_w32/lib/wx/include/i686-w64-mingw32-msw-unicode-3.1 -
 
 #CFLAGS +=`i686-w64-mingw32-msw-unicode-3.1  --cxxflags` 
 
-ELIBS_= $(addsuffix .aw32 ,$(ELIBS))
-
-LIBS= $(ELIBS_) -llxrad -lOpenAL32 -lpicsim  -lsimavr -lws2_32 -L../dev_w32/lib
+LIBS= $(ELIBS) -llxrad -lOpenAL32 -lpicsim  -lsimavr -lws2_32 -L../dev_w32/lib
 LIBS+= -Wl,--subsystem,windows -mwindows -lwx_mswu_xrc-3.1-i686-w64-mingw32 -lwx_mswu_html-3.1-i686-w64-mingw32 -lwx_mswu_qa-3.1-i686-w64-mingw32 -lwx_mswu_core-3.1-i686-w64-mingw32 -lwx_baseu_xml-3.1-i686-w64-mingw32 -lwx_baseu_net-3.1-i686-w64-mingw32 -lwx_baseu-3.1-i686-w64-mingw32 
 
 #LIBS+=`i686-w64-mingw32-msw-unicode-3.1 --libs` 

src/boards/board_ucsim.cc

@@ -24,7 +24,7 @@
    ######################################################################## */
 
 
-#include "../../ucsim/picsimlab/ucsimlib.h"
+#include <ucsim/ucsimlib.h>
 
 #include "board_ucsim.h"
 #include"../picsimlab1.h"