Revert "(ugui) Move all files to deps folder"

This reverts commit 5fbf0b0a92.

.gitignore

@@ -20,5 +20,3 @@ nul
 /msvc/.vs/msvc-2010/v14/*.suo
 /msvc/.vs/msvc-2015/v14/*.suo
 /msvc/msvc-2015.VC.VC.opendb
-
-/vscode/ipch/*

Makefile.common

@@ -43,8 +43,9 @@ ifneq (,$(findstring msvc,$(platform)))
 INCFLAGS += -I$(CORE_DIR)/msvc
 endif
 
-SOURCES_C += $(wildcard $(DEPS_DIR)/zlib/*.c) \
-             $(wildcard $(DEPS_DIR)/ugui/*.c)
+SOURCES_C +=   $(wildcard $(DEPS_DIR)/zlib/*.c) \
+               $(DEPS_DIR)/ugui/ugui.c \
+               $(CORE_DIR)/ugui_tools.c
 
 ifeq ($(HAVE_GRIFFIN),1)
    SOURCES_CXX += beetle_psx_griffin.cpp \

libretro.cpp

@@ -13,7 +13,7 @@
 #include <streams/file_stream.h>
 #include <string/stdstring.h>
 #include <rhash.h>
-#include "deps/ugui/ugui_tools.h"
+#include "ugui_tools.h"
 #include "rsx/rsx_intf.h"
 #include "libretro_cbs.h"
 #include "libretro_options.h"