refactor(headers): cleanup (#83)

include/gsc_api.hpp

@@ -1,32 +0,0 @@
-// Copyright 2023 xensik. All rights reserved.
-//
-// Use of this source code is governed by a GNU GPLv3 license
-// that can be found in the LICENSE file.
-
-#pragma once
-
-#ifdef _WINDOWS_
-#undef ERROR
-#undef IN
-#undef TRUE
-#undef FALSE
-#undef far
-#endif
-
-#include "../src/stdinc.hpp"
-
-#ifdef XSK_GSC_IW5_PC
-#include "../src/iw5/iw5_pc.hpp"
-#endif
-
-#ifdef XSK_GSC_IW6_PC
-#include "../src/iw6/iw6_pc.hpp"
-#endif
-
-#ifdef XSK_GSC_S1_PC
-#include "../src/s1/s1_pc.hpp"
-#endif
-
-#ifdef XSK_GSC_T6_PC
-#include "../src/t6/t6.hpp"
-#endif

premake5.lua

@@ -131,7 +131,6 @@ project "xsk-tool"
     }
 
     includedirs {
-        "./src/tool",
         "./src"
     }
 
@@ -149,7 +148,6 @@ project "xsk-utils"
     }
 
     includedirs {
-        "./src/utils",
         "./src"
     }
 
@@ -167,7 +165,6 @@ project "xsk-gsc"
     }
 
     includedirs {
-        "./src/gsc",
         "./src"
     }
 
@@ -187,7 +184,6 @@ project "xsk-iw5_pc"
     }
 
     includedirs {
-        "./src/iw5",
         "./src"
     }
 
@@ -207,7 +203,6 @@ project "xsk-iw5_ps"
     }
 
     includedirs {
-        "./src/iw5",
         "./src"
     }
 
@@ -227,7 +222,6 @@ project "xsk-iw5_xb"
     }
 
     includedirs {
-        "./src/iw5",
         "./src"
     }
 
@@ -247,7 +241,6 @@ project "xsk-iw6_pc"
     }
 
     includedirs {
-        "./src/iw6",
         "./src"
     }
 
@@ -267,7 +260,6 @@ project "xsk-iw6_ps"
     }
 
     includedirs {
-        "./src/iw6",
         "./src"
     }
 
@@ -287,7 +279,6 @@ project "xsk-iw6_xb"
     }
 
     includedirs {
-        "./src/iw6",
         "./src"
     }
 
@@ -307,7 +298,6 @@ project "xsk-s1_pc"
     }
 
     includedirs {
-        "./src/s1",
         "./src"
     }
 
@@ -327,7 +317,6 @@ project "xsk-s1_ps"
     }
 
     includedirs {
-        "./src/s1",
         "./src"
     }
 
@@ -347,7 +336,6 @@ project "xsk-s1_xb"
     }
 
     includedirs {
-        "./src/s1",
         "./src"
     }
 
@@ -364,7 +352,6 @@ project "xsk-iw7"
     }
 
     includedirs {
-        "./src/iw7",
         "./src"
     }
 
@@ -381,7 +368,6 @@ project "xsk-iw8"
     }
 
     includedirs {
-        "./src/iw8",
         "./src"
     }
 
@@ -398,7 +384,6 @@ project "xsk-iw9"
     }
 
     includedirs {
-        "./src/iw9",
         "./src"
     }
 
@@ -415,7 +400,6 @@ project "xsk-h1"
     }
 
     includedirs {
-        "./src/h1",
         "./src"
     }
 
@@ -432,7 +416,6 @@ project "xsk-h2"
     }
 
     includedirs {
-        "./src/h2",
         "./src"
     }
 
@@ -449,7 +432,6 @@ project "xsk-s2"
     }
 
     includedirs {
-        "./src/s2",
         "./src"
     }
 
@@ -466,7 +448,6 @@ project "xsk-s4"
     }
 
     includedirs {
-        "./src/s4",
         "./src"
     }
 
@@ -483,7 +464,6 @@ project "xsk-t6"
     }
 
     includedirs {
-        "./src/t6",
         "./src"
     }
 

src/gsc/assembler.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "assembler.hpp"
 #include "context.hpp"
 

src/gsc/assembler.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "misc/types.hpp"
-#include "utils/writer.hpp"
+#include <utils/writer.hpp>
 
 namespace xsk::gsc
 {

src/gsc/compiler.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "compiler.hpp"
 #include "context.hpp"
 

src/gsc/context.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "context.hpp"
 
 namespace xsk::gsc

src/gsc/decompiler.cpp

@@ -3,10 +3,10 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "decompiler.hpp"
 #include "context.hpp"
-#include "utils/string.hpp"
+#include <utils/string.hpp>
 
 namespace xsk::gsc
 {

src/gsc/disassembler.cpp

@@ -3,10 +3,10 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "disassembler.hpp"
 #include "context.hpp"
-#include "utils/string.hpp"
+#include <utils/string.hpp>
 
 namespace xsk::gsc
 {

src/gsc/disassembler.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "misc/types.hpp"
-#include "utils/reader.hpp"
+#include <utils/reader.hpp>
 
 namespace xsk::gsc
 {

src/gsc/lexer.cpp

@@ -3,10 +3,10 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "lexer.hpp"
 #include "context.hpp"
-#include "utils/string.hpp"
+#include <utils/string.hpp>
 
 namespace xsk::gsc
 {

src/gsc/misc/asset.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "asset.hpp"
 
 namespace xsk::gsc

src/gsc/misc/ast.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "location.hpp"
 #include "ast.hpp"
 

src/gsc/misc/exception.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "location.hpp"
 #include "exception.hpp"
 

src/gsc/misc/location.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "location.hpp"
 
 namespace xsk::gsc

src/gsc/misc/lookahead.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "lookahead.hpp"
 
 namespace xsk::gsc

src/gsc/misc/scope.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "scope.hpp"
 
 namespace xsk::gsc

src/gsc/misc/token.cpp

@@ -3,11 +3,11 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "location.hpp"
 #include "space.hpp"
 #include "token.hpp"
-#include "utils/string.hpp"
+#include <utils/string.hpp>
 
 namespace xsk::gsc
 {

src/gsc/preprocessor.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "preprocessor.hpp"
 #include "context.hpp"
 #include "parser.hpp"

src/gsc/source.cpp

@@ -3,12 +3,12 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "source.hpp"
 #include "context.hpp"
 #include "preprocessor.hpp"
 #include "parser.hpp"
-#include "utils/string.hpp"
+#include <utils/string.hpp>
 
 namespace xsk::gsc
 {

src/h1/h1.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::h1
 {

src/h2/h2.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::h2
 {

src/iw5/iw5_pc.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw5_pc
 {

src/iw5/iw5_ps.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw5_ps
 {

src/iw5/iw5_xb.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw5_xb
 {

src/iw6/iw6_pc.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw6_pc
 {

src/iw6/iw6_ps.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw6_ps
 {

src/iw6/iw6_xb.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw6_xb
 {

src/iw7/iw7.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw7
 {

src/iw8/iw8.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw8
 {

src/iw9/iw9.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::iw9
 {

src/s1/s1_pc.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::s1_pc
 {

src/s1/s1_ps.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::s1_ps
 {

src/s1/s1_xb.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::s1_xb
 {

src/s2/s2.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::s2
 {

src/s4/s4.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::s4
 {

src/stdinc.cpp

@@ -1,6 +0,0 @@
-// Copyright 2023 xensik. All rights reserved.
-//
-// Use of this source code is governed by a GNU GPLv3 license
-// that can be found in the LICENSE file.
-
-#include "stdinc.hpp"

src/stdinc.hpp

@@ -31,7 +31,15 @@
 #include <format>
 namespace fmt = std;
 #else
-#include "fmt/core.h"
+#include <fmt/core.h>
+#endif
+
+#ifdef _WINDOWS_
+#undef ERROR
+#undef IN
+#undef TRUE
+#undef FALSE
+#undef far
 #endif
 
 using namespace std::literals;

src/t4/t4.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::t4
 {

src/t5/t5.hpp

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "stdinc.hpp"
-#include "gsc/context.hpp"
+#include <stdinc.hpp>
+#include <gsc/context.hpp>
 
 namespace xsk::gsc::t5
 {

src/t6/t6.hpp

@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <stdinc.hpp>
 #include "utils/string.hpp"
 #include "utils/reader.hpp"
 #include "utils/writer.hpp"

src/tool/main.cpp

@@ -3,27 +3,27 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
-#include "utils/zlib.hpp"
-#include "utils/file.hpp"
-#include "utils/string.hpp"
-#include "iw5/iw5_pc.hpp"
-#include "iw5/iw5_ps.hpp"
-#include "iw5/iw5_xb.hpp"
-#include "iw6/iw6_pc.hpp"
-#include "iw6/iw6_ps.hpp"
-#include "iw6/iw6_xb.hpp"
-#include "iw7/iw7.hpp"
-#include "iw8/iw8.hpp"
-#include "iw9/iw9.hpp"
-#include "s1/s1_pc.hpp"
-#include "s1/s1_ps.hpp"
-#include "s1/s1_xb.hpp"
-#include "s2/s2.hpp"
-#include "s4/s4.hpp"
-#include "h1/h1.hpp"
-#include "h2/h2.hpp"
-#include "t6/t6.hpp"
+#include <stdinc.hpp>
+#include <utils/zlib.hpp>
+#include <utils/file.hpp>
+#include <utils/string.hpp>
+#include <iw5/iw5_pc.hpp>
+#include <iw5/iw5_ps.hpp>
+#include <iw5/iw5_xb.hpp>
+#include <iw6/iw6_pc.hpp>
+#include <iw6/iw6_ps.hpp>
+#include <iw6/iw6_xb.hpp>
+#include <iw7/iw7.hpp>
+#include <iw8/iw8.hpp>
+#include <iw9/iw9.hpp>
+#include <s1/s1_pc.hpp>
+#include <s1/s1_ps.hpp>
+#include <s1/s1_xb.hpp>
+#include <s2/s2.hpp>
+#include <s4/s4.hpp>
+#include <h1/h1.hpp>
+#include <h2/h2.hpp>
+#include <t6/t6.hpp>
 
 namespace fs = std::filesystem;
 

src/utils/file.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "file.hpp"
 
 namespace xsk::utils

src/utils/reader.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "reader.hpp"
 
 namespace xsk::utils

src/utils/string.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "string.hpp"
 
 namespace xsk::utils

src/utils/writer.cpp

@@ -3,7 +3,7 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "writer.hpp"
 
 namespace xsk::utils

src/utils/zlib.cpp

@@ -3,9 +3,9 @@
 // Use of this source code is governed by a GNU GPLv3 license
 // that can be found in the LICENSE file.
 
-#include "stdinc.hpp"
+#include <stdinc.hpp>
 #include "zlib.hpp"
-#include "zlib.h"
+#include <zlib.h>
 
 namespace xsk::utils
 {