New typegen terminology

diff --git a/.gitignore b/.gitignore
index e45f4e3d54657573b53fe0d598d6d657482ab78f..f807083df8e8340356625e77fd380e0fd54eedc1 100644 (file)
--- 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 ad29973deabe031f3078b11a82971199c8e3cf5f..123dddc37f4afc77acf8a76139a866f06534dd46 100644 (file)
--- 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 fbd565628287360141c249e2d5d7fb259cbdfa77..3b79c62af540f8914375098ed79ee746bf141a92 100644 (file)
--- 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 0557f787cf52b2ef9f15d7dd99ce8ffc571c6b8f..7c54779600341021b01ba3c86e79e2fd5de9b818 160000 (submodule)
--- a/deps/dragonnet
+++ b/deps/dragonnet
@@ -1 +1 @@
-Subproject commit 0557f787cf52b2ef9f15d7dd99ce8ffc571c6b8f
+Subproject commit 7c54779600341021b01ba3c86e79e2fd5de9b818

diff --git a/messages.dnet b/messages.dnet
deleted file mode 100644 (file)
index 0988e68..0000000
--- a/messages.dnet
+++ /dev/null
@@ -1,5 +0,0 @@
-PingPacket
-       s32 number
-
-PongPacket
-       s32 number

diff --git a/server.c b/server.c
index 30b242afae8a726cf0ca30052e4d16581dde45f8..992f779dfa0b93dde97aa99e3697ec23e4addc31 100644 (file)
--- 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/types.dnet b/types.dnet
new file mode 100644 (file)
index 0000000..0988e68
--- /dev/null
+++ b/types.dnet
@@ -0,0 +1,5 @@
+PingPacket
+       s32 number
+
+PongPacket
+       s32 number