CpuLib|MdePkg/Library/BaseCpuLibNull/BaseCpuLibNull.inf\r
CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLibNull/BaseCacheMaintenanceLibNull.inf\r
CmockaLib|UnitTestFrameworkPkg/Library/CmockaLib/CmockaLib.inf\r
+ GoogleTestLib|UnitTestFrameworkPkg/Library/GoogleTestLib/GoogleTestLib.inf\r
UnitTestLib|UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLibCmocka.inf\r
DebugLib|UnitTestFrameworkPkg/Library/Posix/DebugLibPosix/DebugLibPosix.inf\r
MemoryAllocationLib|UnitTestFrameworkPkg/Library/Posix/MemoryAllocationLibPosix/MemoryAllocationLibPosix.inf\r
+ UefiBootServicesTableLib|UnitTestFrameworkPkg/Library/UnitTestUefiBootServicesTableLib/UnitTestUefiBootServicesTableLib.inf\r
\r
[BuildOptions]\r
GCC:*_*_*_CC_FLAGS = -fno-pie\r
+!ifdef $(UNIT_TESTING_DEBUG)\r
+ MSFT:*_*_*_CC_FLAGS = -D UNIT_TESTING_DEBUG=1\r
+ GCC:*_*_*_CC_FLAGS = -D UNIT_TESTING_DEBUG=1\r
+ XCODE:*_*_*_CC_FLAGS = -D UNIT_TESTING_DEBUG=1\r
+!endif\r
\r
[BuildOptions.common.EDKII.HOST_APPLICATION]\r
#\r
# MSFT\r
#\r
- MSFT:*_*_*_DLINK_FLAGS == /out:"$(BIN_DIR)\$(BASE_NAME).exe" /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb" /IGNORE:4001 /NOLOGO /SUBSYSTEM:CONSOLE /DEBUG /NODEFAULTLIB:libcmt.lib libcmtd.lib\r
+ MSFT:*_*_*_CC_FLAGS = /EHsc\r
+ MSFT:*_*_*_DLINK_FLAGS == /out:"$(BIN_DIR)\$(MODULE_NAME_GUID).exe" /pdb:"$(BIN_DIR)\$(MODULE_NAME_GUID).pdb" /IGNORE:4001 /NOLOGO /SUBSYSTEM:CONSOLE /DEBUG /STACK:0x40000,0x40000 /NODEFAULTLIB:libcmt.lib libcmtd.lib\r
MSFT:*_*_IA32_DLINK_FLAGS = /MACHINE:I386\r
MSFT:*_*_X64_DLINK_FLAGS = /MACHINE:AMD64\r
\r
#\r
# GCC\r
#\r
- GCC:*_*_IA32_DLINK_FLAGS == -o $(BIN_DIR)/$(BASE_NAME) -m32 -no-pie\r
- GCC:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/$(BASE_NAME) -m64 -no-pie\r
- GCC:*_*_*_DLINK2_FLAGS == -lgcov\r
+ GCC:*_*_IA32_DLINK_FLAGS == -o $(BIN_DIR)/$(MODULE_NAME_GUID) -m32 -no-pie\r
+ GCC:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/$(MODULE_NAME_GUID) -m64 -no-pie\r
+ GCC:*_*_*_DLINK2_FLAGS == -lgcov -lpthread -lstdc++ -lm\r
\r
#\r
# Need to do this link via gcc and not ld as the pathing to libraries changes from OS version to OS version\r
#\r
XCODE:*_*_IA32_DLINK_PATH == gcc\r
XCODE:*_*_IA32_CC_FLAGS = -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack\r
- XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -framework Carbon\r
+ XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/$(MODULE_NAME_GUID) -L/usr/X11R6/lib -lXext -lX11 -framework Carbon\r
XCODE:*_*_IA32_ASM_FLAGS == -arch i386 -g\r
\r
XCODE:*_*_X64_DLINK_PATH == gcc\r
- XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -framework Carbon -Wl,-no_pie\r
+ XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/$(MODULE_NAME_GUID) -L/usr/X11R6/lib -lXext -lX11 -framework Carbon -Wl,-no_pie\r
XCODE:*_*_X64_ASM_FLAGS == -g\r
XCODE:*_*_X64_CC_FLAGS = -O0 -target x86_64-apple-darwin -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack "-DEFIAPI=__attribute__((ms_abi))"\r