Browse Source

Move terminal_helper.h back into src/ since it's a member of the mainprogs, not the library.

Sam Jaffe 4 năm trước cách đây
mục cha
commit
b777355abf

+ 18 - 0
dice-roll.xcodeproj/project.pbxproj

@@ -120,6 +120,7 @@
 		CDEE78ED25B3350B00F195F9 /* xcode_gtest_helper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = xcode_gtest_helper.h; sourceTree = "<group>"; };
 		CDEE78F625B336B000F195F9 /* parser.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = parser.cxx; sourceTree = "<group>"; };
 		CDEE790125B336EC00F195F9 /* io.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = io.cxx; sourceTree = "<group>"; };
+		CDEE7A5925B3437D00F195F9 /* terminal_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terminal_helper.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -223,6 +224,7 @@
 		CDED6A2521B2F28A00AB91D0 /* src */ = {
 			isa = PBXGroup;
 			children = (
+				CDEE7A5925B3437D00F195F9 /* terminal_helper.h */,
 				CD38F54E21C945C2007A732C /* terminal_helper.cxx */,
 				CDED6A3021B2F2DC00AB91D0 /* die.cxx */,
 				CDEE78F625B336B000F195F9 /* parser.cxx */,
@@ -551,6 +553,10 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/include/",
+					"$(PROJECT_DIR)/src/",
+				);
 			};
 			name = Debug;
 		};
@@ -560,6 +566,10 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/include/",
+					"$(PROJECT_DIR)/src/",
+				);
 			};
 			name = Release;
 		};
@@ -692,6 +702,10 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/include/",
+					"$(PROJECT_DIR)/src/",
+				);
 			};
 			name = Debug;
 		};
@@ -701,6 +715,10 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				USER_HEADER_SEARCH_PATHS = (
+					"$(PROJECT_DIR)/include/",
+					"$(PROJECT_DIR)/src/",
+				);
 			};
 			name = Release;
 		};

+ 1 - 1
simple_dice/main.cxx

@@ -9,7 +9,7 @@
 #include <iostream>
 
 #include "dice-roll/exception.h"
-#include "dice-roll/terminal_helper.h"
+#include "terminal_helper.h"
 
 void eval(std::string const & str) {
   try {

+ 1 - 1
src/terminal_helper.cxx

@@ -6,7 +6,7 @@
 //  Copyright © 2018 Sam Jaffe. All rights reserved.
 //
 
-#include "dice-roll/terminal_helper.h"
+#include "terminal_helper.h"
 
 #include <iostream>
 

include/dice-roll/terminal_helper.h → src/terminal_helper.h


+ 1 - 1
stateful_dice/main.cxx

@@ -12,7 +12,7 @@
 #include <regex>
 
 #include "dice-roll/exception.h"
-#include "dice-roll/terminal_helper.h"
+#include "terminal_helper.h"
 
 void usage() {
   std::cout << "'help'      : Print this message\n";