Improved DDV_Controller makefile, fixed a bug. (Hoi Niels!)

This commit is contained in:
Thulinma 2012-03-12 11:47:49 +01:00
parent cd9ed87802
commit 32880330fd
2 changed files with 2 additions and 2 deletions

View file

@ -17,7 +17,7 @@ LIBS = -lssl -lcrypto
.PHONY: clean default .PHONY: clean default
default: cversion $(OUT) default: cversion $(OUT)
.cpp.o: .cpp.o:
$(CC) $(INCLUDES) $(CCFLAGS) $(LIBS) -c $< -o $@ $(CC) $(INCLUDES) $(CCFLAGS) -c $< -o $@
$(OUT): $(OBJ) $(OUT): $(OBJ)
$(CC) -o $(OUT) $(OBJ) $(LIBS) $(CC) -o $(OUT) $(OBJ) $(LIBS)
clean: clean:

View file

@ -510,7 +510,7 @@
$('#config-name').val(settings.settings.config.name); $('#config-name').val(settings.settings.config.name);
$('#config-version').text('version: ' + (settings.settings.config.version || '')); $('#config-version').text('version: ' + (settings.settings.config.version || ''));
$('#config-time').text('time: ' + new Date(settings.settings.config.time).toUTCString() || ''); $('#config-time').text('time: ' + new Date(settings.settings.config.time*1000).toUTCString() || '');
$('#config-status').text('status: ' + (settings.settings.config.status || '')); $('#config-status').text('status: ' + (settings.settings.config.status || ''));
} }