diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt
index ab9db52be..2c4d0c99a 100644
--- a/base/CMakeLists.txt
+++ b/base/CMakeLists.txt
@@ -1,7 +1,8 @@
 set(SRCS
   LAMEString.cpp
   colorutil.cpp
-  error_context.cpp)
+  error_context.cpp
+  display.cpp)
 
 set(SRCS ${SRCS})
 
diff --git a/base/PCMain.cpp b/base/PCMain.cpp
index 3517a8c90..8ad3ebd50 100644
--- a/base/PCMain.cpp
+++ b/base/PCMain.cpp
@@ -6,6 +6,8 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 #include <ShellAPI.h>
+#else
+#include <pwd.h>
 #endif
 
 #include <string>
@@ -169,7 +171,7 @@ int main(int argc, char *argv[]) {
 #else
 	// Mac - what about linux? Also, ugly hardcoding.
 	const char *path = getenv("HOME");
-	if (!homeDir) {
+	if (!path) {
 		struct passwd* pwd = getpwuid(getuid());
 		if (pwd)
 			path = pwd->pw_dir;