fixed compile errors and makefile error omitting config.o
This commit is contained in:
parent
dde3bda516
commit
cfc067786a
|
@ -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
|
LIBS=-lbcm2835 -lpthread
|
||||||
|
|
||||||
upiwin: $(OBJS)
|
upiwin: $(OBJS)
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <getopt.h>
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "scode.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
|
|
||||||
static const struct option long_options[] = {
|
static const struct option long_options[] = {
|
||||||
|
@ -78,7 +81,7 @@ static HRESULT parse_cmdline(int argc, char *argv[], GLOBAL_CONFIG *parsed)
|
||||||
return E_OUTOFMEMORY;
|
return E_OUTOFMEMORY;
|
||||||
}
|
}
|
||||||
if (parsed->framebuffer_device)
|
if (parsed->framebuffer_device)
|
||||||
free(parsed->framebuffer_device);
|
free((PVOID)(parsed->framebuffer_device));
|
||||||
parsed->framebuffer_device = pstr;
|
parsed->framebuffer_device = pstr;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -119,7 +122,7 @@ HRESULT Config_setup(int argc, char *argv[])
|
||||||
hr = parse_cmdline(argc, argv, &from_commandline);
|
hr = parse_cmdline(argc, argv, &from_commandline);
|
||||||
if (hr != S_OK)
|
if (hr != S_OK)
|
||||||
return hr;
|
return hr;
|
||||||
overlay_config(&from_commandline)
|
overlay_config(&from_commandline);
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include "scode.h"
|
#include "scode.h"
|
||||||
|
#include "config.h"
|
||||||
#include "log.h"
|
#include "log.h"
|
||||||
#include "msg_queue.h"
|
#include "msg_queue.h"
|
||||||
#include "gpio.h"
|
#include "gpio.h"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user