From 61a325ae092b1d77ea437defb11b8ce24f12c4e4 Mon Sep 17 00:00:00 2001
From: 0x8081 <shadowbrony33@gmail.com>
Date: Sat, 17 Aug 2019 21:55:32 -0600
Subject: [PATCH] Update to Master and merge inital syslink implementation

---
 premake5.lua               | 1 +
 src/xenia/net/premake5.lua | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/premake5.lua b/premake5.lua
index 212ffc9e1..5309b5571 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -249,6 +249,7 @@ solution("xenia")
   include("src/xenia/hid")
   include("src/xenia/hid/nop")
   include("src/xenia/kernel")
+  include("src/xenia/net")
   include("src/xenia/ui")
   include("src/xenia/ui/spirv")
   include("src/xenia/ui/vk")
diff --git a/src/xenia/net/premake5.lua b/src/xenia/net/premake5.lua
index 119d72080..0244dc338 100644
--- a/src/xenia/net/premake5.lua
+++ b/src/xenia/net/premake5.lua
@@ -1,5 +1,5 @@
 project_root = "../../.."
-include(project_root.."/build_tools")
+include(project_root.."/tools/build")
 
 group("src")
 project("xenia-net-proxy")
@@ -9,20 +9,15 @@ project("xenia-net-proxy")
   links({
     project_root.."/third_party/winpcap/Lib/x64/Packet",
 	project_root.."/third_party/winpcap/Lib/x64/wpcap",
-	"gflags",
     "xenia-base",
     "xxhash",
   })
-  flags({
-    "WinMain",  -- Use WinMain instead of main.
-  })
   defines({
     "HAVE_REMOTE=1"
   })
   includedirs({
     project_root.."/third_party/elemental-forms/src",
 	project_root.."/third_party/winpcap/Include",
-    project_root.."/build_tools/third_party/gflags/src",
   })
   files({
     "net_proxy_main.cc",
@@ -33,7 +28,6 @@ project("xenia-net-proxy")
   filter("platforms:Windows")
   debugdir(project_root)
   debugargs({
-    "--flagfile=scratch/flags.txt",
     "2>&1",
     "1>scratch/stdout-net-proxy.txt",
   })
\ No newline at end of file