fixed compile errors and makefile error omitting config.o

This commit is contained in:
Amy G. Bowersox 2019-12-06 22:45:01 -07:00
parent dde3bda516
commit cfc067786a
3 changed files with 7 additions and 3 deletions

View File

@ -1,4 +1,4 @@
OBJS=main.o sysinput.o fbinit.o log.o gpio.o msg_queue.o time_func.o splash.o
OBJS=main.o sysinput.o fbinit.o log.o gpio.o msg_queue.o time_func.o config.o splash.o
LIBS=-lbcm2835 -lpthread
upiwin: $(OBJS)

View File

@ -1,7 +1,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <getopt.h>
#include "config.h"
#include "scode.h"
#include "log.h"
static const struct option long_options[] = {
@ -78,7 +81,7 @@ static HRESULT parse_cmdline(int argc, char *argv[], GLOBAL_CONFIG *parsed)
return E_OUTOFMEMORY;
}
if (parsed->framebuffer_device)
free(parsed->framebuffer_device);
free((PVOID)(parsed->framebuffer_device));
parsed->framebuffer_device = pstr;
break;
@ -119,7 +122,7 @@ HRESULT Config_setup(int argc, char *argv[])
hr = parse_cmdline(argc, argv, &from_commandline);
if (hr != S_OK)
return hr;
overlay_config(&from_commandline)
overlay_config(&from_commandline);
return S_OK;
}

View File

@ -3,6 +3,7 @@
#include <string.h>
#include <pthread.h>
#include "scode.h"
#include "config.h"
#include "log.h"
#include "msg_queue.h"
#include "gpio.h"