From be0552a7c55051ba42ad6c81e754a312455c98e9 Mon Sep 17 00:00:00 2001
From: Elias Fleckenstein <eliasfleckenstein@web.de>
Date: Mon, 4 Oct 2021 13:55:18 +0200
Subject: [PATCH] New typegen terminology

---
 .gitignore                  |  4 ++--
 CMakeLists.txt              | 14 +++++++-------
 client.c                    |  2 +-
 deps/dragonnet              |  2 +-
 server.c                    |  2 +-
 messages.dnet => types.dnet |  0
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename messages.dnet => types.dnet (100%)

diff --git a/.gitignore b/.gitignore
index e45f4e3..f807083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
-DragonnetGenMessages
+DragonnetTypegen
 ExampleClient
 ExampleServer
-messages.h
+dnet-types.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ad29973..123dddc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,21 +29,21 @@ set(SOURCES_COMMON
 	"${DEPS_DIR}/dragonnet/recv_thread.c"
 )
 
-add_executable(DragonnetGenMessages
+add_executable(DragonnetTypegen
 	${SOURCES_COMMON}
-	"${DEPS_DIR}/dragonnet/gen_messages.c"
+	"${DEPS_DIR}/dragonnet/typegen/main.c"
 )
 
 add_custom_command(
-	OUTPUT "${CMAKE_SOURCE_DIR}/messages.h"
-	COMMAND "${CMAKE_BINARY_DIR}/DragonnetGenMessages"
-	MAIN_DEPENDENCY "${CMAKE_SOURCE_DIR}/messages.dnet"
-	DEPENDS DragonnetGenMessages
+	OUTPUT "${CMAKE_SOURCE_DIR}/dnet-types.h"
+	COMMAND "${CMAKE_BINARY_DIR}/DragonnetTypegen"
+	MAIN_DEPENDENCY "${CMAKE_SOURCE_DIR}/types.dnet"
+	DEPENDS DragonnetTypegen
 	WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
 )
 
 add_custom_target(ExampleMessages
-	DEPENDS "${CMAKE_SOURCE_DIR}/messages.h"
+	DEPENDS "${CMAKE_SOURCE_DIR}/dnet-types.h"
 )
 
 add_executable(ExampleClient
diff --git a/client.c b/client.c
index fbd5656..3b79c62 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "messages.h"
+#include "dnet-types.h"
 
 int main()
 {
diff --git a/deps/dragonnet b/deps/dragonnet
index 0557f78..7c54779 160000
--- a/deps/dragonnet
+++ b/deps/dragonnet
@@ -1 +1 @@
-Subproject commit 0557f787cf52b2ef9f15d7dd99ce8ffc571c6b8f
+Subproject commit 7c54779600341021b01ba3c86e79e2fd5de9b818
diff --git a/server.c b/server.c
index 30b242a..992f779 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "messages.h"
+#include "dnet-types.h"
 
 int main()
 {
diff --git a/messages.dnet b/types.dnet
similarity index 100%
rename from messages.dnet
rename to types.dnet
-- 
2.44.0