Merge unit test fixes to previous commit

This commit is contained in:
Jason Perkins 2014-09-28 14:50:22 -04:00
commit 7ef47ef3ea

View File

@ -71,6 +71,8 @@ OBJECTS := \
RESOURCES := \
CUSTOMFILES := \
ifeq ($(config),debug)
OBJECTS += \
$(OBJDIR)/hello_debug.o \
@ -123,6 +125,8 @@ OBJECTS := \
RESOURCES := \
CUSTOMFILES := \
ifeq ($(config),debug)
OBJECTS += \
obj/Debug/hello.obj \
@ -147,6 +151,8 @@ OBJECTS := \
RESOURCES := \
CUSTOMFILES := \
ifeq ($(config),release)
OBJECTS += \
$(OBJDIR)/hello.o \
@ -166,6 +172,8 @@ OBJECTS := \
RESOURCES := \
CUSTOMFILES := \
ifeq ($(config),release)
OBJECTS += \
$(OBJDIR)/hello.o \