Commit 1ddd1203 authored by lcgamboa's avatar lcgamboa

chg: support to build X11 version !minor

parent c536e724
include ../VERSION
override CFLAGS+= -DEXT_BROWSER_EXAMPLES
OBJS = ppicsimlab.o picsimlab1.o picsimlab2.o picsimlab3.o picsimlab4.o picsimlab5.o\
boards/board.o boards/boards_defs.o boards/board_pic.o boards/board_avr.o boards/board_avr_serial.o\
......
......@@ -18,7 +18,7 @@ override CFLAGS += -DEXT_BROWSER -D_VERSION_=\"${VERSION}\" -Wall -ggdb -D_SHARE
#override CFLAGS+= -D_NOTHREAD
#override CFLAGS+=-fsanitize=address
override CFLAGS+= -D_EXPERIMENTAL_
override CFLAGS+= -D_EXPERIMENTAL_ -DAVR_USE_GDB
#LIBS = `lxrad_X11-config --libs` -lpicsim -lsimavr -lelf -lminizip
LIBS = `lxrad_X11-config --libs` ../../picsim/src/libpicsim_dbg.a ../../simavr/simavr/obj-x86_64-linux-gnu/libsimavr.a -lelf -lminizip
......
......@@ -244,7 +244,9 @@ board_avr::MEnd(void)
free (avr);
avr = NULL;
#ifndef AVR_USE_GDB
#ifdef AVR_USE_GDB
avr_deinit_gdb (avr);
#else
mplabxd_end ();
#endif
}
......@@ -296,10 +298,14 @@ board_avr::DebugInit(void)
void
board_avr::DebugLoop(void)
{
#ifndef AVR_USE_GDB
#ifdef AVR_USE_GDB
if (Window1.Get_mcupwr ())
{
//prog_loop(&pic);
}
#else
if (Window1.Get_mcupwr ())
{
mplabxd_loop ();
}
#endif
......
include ../../VERSION
CC = g++
prefix=/usr
RM= rm -f
CP= cp
MKDIR = mkdir -p
appdir= ${prefix}/share/applications/
execdir= ${prefix}/bin/
sharedir= ${prefix}/share/picsimlab/
#lxrad automatic generated block start, don't edit below!
FLAGS = -D_VERSION_=\"$(VERSION)\" -D_SHARE_=\"${sharedir}\" -Wall -O2 -DLINUX `lxrad_X11-config --cxxflags`
FLAGS+= -DEXT_BROWSER
LIBS = `lxrad_X11-config --libs`
OBJS = pespmsim.o espmsim1.o espmsim2.o serial.o tcp.o
#lxrad automatic generated block end, don't edit above!
all: $(OBJS)
$(CC) $(FLAGS) $(OBJS) -oespmsim_X11 $(LIBS)
%.o: %.cc
$(CC) -c $(FLAGS) $<
run: all
./espmsim
install: all
$(CP) -dvf ../../share/espmsim.desktop ${appdir}
$(CP) -dvf espmsim ${execdir}
uninstall:
$(RM) -dvf ${execdir}espmsim
$(RM) -dvf ${appdir}espmsim.desktop
clean:
rm -f espmsim_X11 *.o core
......@@ -4,7 +4,7 @@
#ifdef CONSOLE
#include"cespmsim.h"
#else
#include<lxrad/lxrad.h>
#include<lxrad.h>
#endif
#ifdef _WIN_
......
#ifndef CPWINDOW2
#define CPWINDOW2
#include<lxrad/lxrad.h>
#include<lxrad.h>
class CPWindow2:public CPWindow
{
......
#include<lxrad/lxrad.h>
#include<lxrad.h>
#include"espmsim1.h"
#include"espmsim2.h"
......
include ../../VERSION
CC = g++
prefix=/usr
RM= rm -f
CP= cp
MKDIR = mkdir -p
appdir= ${prefix}/share/applications/
execdir= ${prefix}/bin/
sharedir= ${prefix}/share/picsimlab/
#lxrad automatic generated block start, don't edit below!
FLAGS = -D_VERSION_=\"$(VERSION)\" -D_SHARE_=\"${sharedir}\" -Wall -O2 `lxrad_X11-config --cxxflags`
FLAGS+= -DEXT_BROWSER
LIBS = `lxrad_X11-config --libs`
OBJS = psrtank.o srtank1.o srtank2.o serial.o
#lxrad automatic generated block end, don't edit above!
all: $(OBJS)
$(CC) $(FLAGS) $(OBJS) -osrtank_X11 $(LIBS)
%.o: %.cc
$(CC) -c $(FLAGS) $<
run: all
./srtank
install: all
$(CP) -dvf ../../share/srtank.desktop ${appdir}
$(CP) -dvf srtank ${execdir}
uninstall:
$(RM) -dvf ${execdir}srtank
$(RM) -dvf ${appdir}srtank.desktop
clean:
rm -f srtank *.o core
#include<lxrad/lxrad.h>
#include<lxrad.h>
#include"srtank1.h"
#include"srtank2.h"
......
#ifndef CPWINDOW1
#define CPWINDOW1
#include<lxrad/lxrad.h>
#include<lxrad.h>
#ifdef _WIN_
#include <wx/filename.h>
......
This diff is collapsed.
#ifndef CPWINDOW2
#define CPWINDOW2
#include<lxrad/lxrad.h>
#include<lxrad.h>
class CPWindow2:public CPWindow
{
......
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