normalize includes: eqlaunch

eqlaunch/CMakeLists.txt

@@ -16,6 +16,7 @@ add_executable(eqlaunch ${eqlaunch_sources} ${eqlaunch_headers})
 install(TARGETS eqlaunch RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
 target_link_libraries(eqlaunch common)
+target_include_directories(eqlaunch PRIVATE ..)
 
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 set_property(TARGET eqlaunch PROPERTY FOLDER executables/tools)

eqlaunch/eqlaunch.cpp

@@ -16,17 +16,18 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/proc_launcher.h"
-#include "../common/eqemu_config.h"
-#include "../common/servertalk.h"
-#include "../common/path_manager.h"
-#include "../common/platform.h"
-#include "../common/crash.h"
-#include "../common/unix.h"
-#include "worldserver.h"
-#include "zone_launch.h"
+#include "common/crash.h"
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/global_define.h"
+#include "common/path_manager.h"
+#include "common/platform.h"
+#include "common/proc_launcher.h"
+#include "common/servertalk.h"
+#include "common/unix.h"
+#include "eqlaunch/worldserver.h"
+#include "eqlaunch/zone_launch.h"
+
 #include <vector>
 #include <map>
 #include <set>

eqlaunch/worldserver.cpp

@@ -16,13 +16,14 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/servertalk.h"
-#include "../common/eqemu_config.h"
-#include "../common/strings.h"
 #include "worldserver.h"
-#include "zone_launch.h"
+
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/global_define.h"
+#include "common/servertalk.h"
+#include "common/strings.h"
+#include "eqlaunch/zone_launch.h"
 
 WorldServer::WorldServer(std::map<std::string, ZoneLaunch *> &zones, const char *name, const EQEmuConfig *config)
 	: m_name(name),

eqlaunch/worldserver.h

@@ -15,14 +15,15 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef WORLDSERVER_H
-#define WORLDSERVER_H
 
-#include "../common/net/servertalk_client_connection.h"
-#include <memory>
-#include <string>
-#include <queue>
+#pragma once
+
+#include "common/net/servertalk_client_connection.h"
+
 #include <map>
+#include <memory>
+#include <queue>
+#include <string>
 
 class ZoneLaunch;
 class EQEmuConfig;
@@ -44,5 +45,3 @@ private:
 	const EQEmuConfig *const m_config;
 	std::map<std::string, ZoneLaunch *> &m_zones;
 };
-#endif
-

eqlaunch/zone_launch.cpp

@@ -16,11 +16,12 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/eqemu_config.h"
 #include "zone_launch.h"
-#include "worldserver.h"
+
+#include "common/eqemu_config.h"
+#include "common/eqemu_logsys.h"
+#include "common/global_define.h"
+#include "eqlaunch/worldserver.h"
 
 //static const uint32 ZONE_RESTART_DELAY = 10000;
 //static const uint32 ZONE_TERMINATE_WAIT = 10000;

eqlaunch/zone_launch.h

@@ -15,11 +15,12 @@
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
-#ifndef ZONELAUNCH_H_
-#define ZONELAUNCH_H_
 
-#include "../common/proc_launcher.h"
-#include "../common/timer.h"
+#pragma once
+
+#include "common/proc_launcher.h"
+#include "common/timer.h"
+
 #include <string>
 
 class WorldServer;
@@ -71,5 +72,3 @@ private:
 	static int s_running;
 	static Timer s_startTimer;
 };
-
-#endif /*ZONELAUNCH_H_*/