From c545f51bdd494e0c25ae0d997697245462ada376 Mon Sep 17 00:00:00 2001
From: Matthew Fernandez <matthew.fernandez@gmail.com>
Date: Sun, 23 Aug 2020 15:51:58 -0700
Subject: [PATCH] disambiguate cmd/gvedit #includes

Related to #1785.
---
 cmd/gvedit/Makefile.am    | 1 +
 cmd/gvedit/csettings.h    | 2 +-
 cmd/gvedit/gvedit.vcxproj | 4 ++--
 cmd/gvedit/main.cpp       | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index ccf1eea30..355c5ea7c 100644
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -17,6 +17,7 @@ pdf_DATA = $(pdfs)
 endif
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/lib/common \
 	-I$(top_srcdir)/lib/gvc \
 	-I$(top_srcdir)/lib/pathplan \
diff --git a/cmd/gvedit/csettings.h b/cmd/gvedit/csettings.h
index 04c63143e..166662ae2 100644
--- a/cmd/gvedit/csettings.h
+++ b/cmd/gvedit/csettings.h
@@ -22,7 +22,7 @@ class MdiChild;
 
 #include "config.h"
 
-#include "gvc.h"
+#include <gvc/gvc.h>
 
 class CFrmSettings : public QDialog
 {
diff --git a/cmd/gvedit/gvedit.vcxproj b/cmd/gvedit/gvedit.vcxproj
index 80247f4d2..c46ef5ff0 100644
--- a/cmd/gvedit/gvedit.vcxproj
+++ b/cmd/gvedit/gvedit.vcxproj
@@ -60,7 +60,7 @@
     <ClCompile>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Qt\4.8.3\include\QtCore;..\..\..\..\Qt\4.8.3\include\QtGui;..\..\..\..\Qt\4.8.3\include;..\..\lib\gvc;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cgraph;..\..\lib\cdt;..\..;..\..\..\..\Qt\4.8.3\include\ActiveQt;debug;..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Qt\4.8.3\include\QtCore;..\..\..\..\Qt\4.8.3\include\QtGui;..\..\..\..\Qt\4.8.3\include;$(SolutionDir)\lib;..\..\lib\gvc;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cgraph;..\..\lib\cdt;..\..;..\..\..\..\Qt\4.8.3\include\ActiveQt;debug;..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
@@ -99,7 +99,7 @@
     <ClCompile>
       <AdditionalOptions>-Zm200 -w34100 -w34189 %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\Qt\4.8.3\include\QtCore;..\..\..\..\Qt\4.8.3\include\QtGui;..\..\..\..\Qt\4.8.3\include;..\..\lib\gvc;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cgraph;..\..\lib\cdt;..\..;..\..\..\..\Qt\4.8.3\include\ActiveQt;release;..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\Qt\4.8.3\include\QtCore;..\..\..\..\Qt\4.8.3\include\QtGui;..\..\..\..\Qt\4.8.3\include;$(SolutionDir)\lib;..\..\lib\gvc;..\..\lib\common;..\..\lib\pathplan;..\..\lib\cgraph;..\..\lib\cdt;..\..;..\..\..\..\Qt\4.8.3\include\ActiveQt;release;..\..\..\..\Qt\4.8.3\mkspecs\win32-msvc2008;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;UNICODE;WIN32;QT_LARGEFILE_SUPPORT;QT_DLL;QT_NO_DEBUG;QT_GUI_LIB;QT_CORE_LIB;QT_HAVE_MMX;QT_HAVE_3DNOW;QT_HAVE_SSE;QT_HAVE_MMXEXT;QT_HAVE_SSE2;QT_THREAD_SUPPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
diff --git a/cmd/gvedit/main.cpp b/cmd/gvedit/main.cpp
index 979111f5f..0901e5e3a 100644
--- a/cmd/gvedit/main.cpp
+++ b/cmd/gvedit/main.cpp
@@ -23,8 +23,8 @@
 #include "mainwindow.h"
 
 #include <getopt.h>
-#include "gvc.h"
-#include "globals.h"
+#include <gvc/gvc.h>
+#include <common/globals.h>
 
 
 #ifdef _WIN32
-- 
2.40.0