restructured

master
Ondřej Hruška 9 years ago
parent 75474aae9c
commit e636ee7a5b
  1. 21
      Makefile
  2. 3
      main.c
  3. 16
      scpi.pro
  4. 2
      scpi.pro.user
  5. 0
      source/scpi_builtins.c
  6. 0
      source/scpi_builtins.h
  7. 0
      source/scpi_errors.c
  8. 0
      source/scpi_errors.h
  9. 0
      source/scpi_parser.c
  10. 0
      source/scpi_parser.h
  11. 0
      source/scpi_regs.c
  12. 0
      source/scpi_regs.h

@ -1,6 +1,23 @@
all: main.c scpi_parser.c scpi_parser.h SRC = main.c
gcc main.c scpi_parser.c scpi_errors.c scpi_regs.c scpi_builtins.c -o main.elf SRC+= source/scpi_parser.c
SRC+= source/scpi_regs.c
SRC+= source/scpi_builtins.c
SRC+= source/scpi_errors.c
HDRS= source/scpi_parser.h
HDRS+= source/scpi_regs.h
HDRS+= source/scpi_builtins.h
HDRS+= source/scpi_errors.h
all: $(SRC) $(HDRS)
gcc $(SRC) -o main.elf
run: all run: all
./main.elf ./main.elf
clean:
rm -f *.o *.d *.so *.elf *.bin *.hex
cd source
rm -f *.o *.d *.so *.elf *.bin *.hex

@ -1,7 +1,8 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "scpi_parser.h"
#include "source/scpi_parser.h"
void cmd_APPL_SIN_cb(const SCPI_argval_t *args) void cmd_APPL_SIN_cb(const SCPI_argval_t *args)

@ -4,11 +4,11 @@ CONFIG -= app_bundle
CONFIG -= qt CONFIG -= qt
SOURCES += \ SOURCES += \
scpi_parser.c \
main.c \ main.c \
scpi_errors.c \ source/scpi_parser.c \
scpi_regs.c \ source/scpi_errors.c \
scpi_builtins.c source/scpi_regs.c \
source/scpi_builtins.c
DISTFILES += \ DISTFILES += \
style.astylerc \ style.astylerc \
@ -18,7 +18,7 @@ DISTFILES += \
Makefile Makefile
HEADERS += \ HEADERS += \
scpi_parser.h \ source/scpi_parser.h \
scpi_errors.h \ source/scpi_errors.h \
scpi_regs.h \ source/scpi_regs.h \
scpi_builtins.h source/scpi_builtins.h

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.5.1, 2015-12-05T00:30:51. --> <!-- Written by QtCreator 3.5.1, 2015-12-05T17:34:08. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

Loading…
Cancel
Save