From 7a0ecea108c41c85af1ce8e3f4a98089bff9aa86 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 00:22:30 +0200 Subject: Increased control over win sdk paths --- NetEx/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'NetEx') diff --git a/NetEx/CMakeLists.txt b/NetEx/CMakeLists.txt index ccb0f01..c3c6652 100644 --- a/NetEx/CMakeLists.txt +++ b/NetEx/CMakeLists.txt @@ -17,11 +17,11 @@ add_library( NetServer.cpp NetSock.cpp ) -set(WINDOWSSDK_PATH "C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0/um") target_include_directories( NetEx PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC ${WINDOWSSDK_PATH} # FIXME + PUBLIC ${WINDOWSSDK_PATH}/um # FIXME + PUBLIC ${WINDOWSSDK_PATH}/shared ) target_link_libraries( NetEx -- cgit v1.1 From 309d3544ca7ab144fa5c60f1cf83b38f17d070b7 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 00:32:11 +0200 Subject: Streamlined file and guard endings in Foundation and NetEx --- NetEx/HttpClient.h | 2 +- NetEx/HttpServer.h | 2 +- NetEx/HttpServlet.h | 2 +- NetEx/HttpServletExec.h | 2 +- NetEx/NetAddr.h | 2 +- NetEx/NetClient.h | 2 +- NetEx/NetGram.h | 2 +- NetEx/NetHost.h | 2 +- NetEx/NetLayer.h | 2 +- NetEx/NetLink.h | 2 +- NetEx/NetMsg.h | 3 ++- NetEx/NetPeer.h | 2 +- NetEx/NetServer.h | 2 +- NetEx/NetSock.h | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) (limited to 'NetEx') diff --git a/NetEx/HttpClient.h b/NetEx/HttpClient.h index e9b84b9..54c5f4e 100644 --- a/NetEx/HttpClient.h +++ b/NetEx/HttpClient.h @@ -64,4 +64,4 @@ protected: }; -#endif HttpClient_h \ No newline at end of file +#endif // HttpClient_h diff --git a/NetEx/HttpServer.h b/NetEx/HttpServer.h index fb74fbc..9101944 100644 --- a/NetEx/HttpServer.h +++ b/NetEx/HttpServer.h @@ -238,4 +238,4 @@ private: }; -#endif HttpServer_h \ No newline at end of file +#endif // HttpServer_h diff --git a/NetEx/HttpServlet.h b/NetEx/HttpServlet.h index e209671..3b94320 100644 --- a/NetEx/HttpServlet.h +++ b/NetEx/HttpServlet.h @@ -106,4 +106,4 @@ protected: }; -#endif HttpServlet_h \ No newline at end of file +#endif // HttpServlet_h diff --git a/NetEx/HttpServletExec.h b/NetEx/HttpServletExec.h index 3ae1be1..168b9d8 100644 --- a/NetEx/HttpServletExec.h +++ b/NetEx/HttpServletExec.h @@ -78,4 +78,4 @@ protected: bool exec_shutdown; }; -#endif HttpServletExec_h \ No newline at end of file +#endif // HttpServletExec_h diff --git a/NetEx/NetAddr.h b/NetEx/NetAddr.h index 32e01c9..c0059d7 100644 --- a/NetEx/NetAddr.h +++ b/NetEx/NetAddr.h @@ -80,4 +80,4 @@ private: }; -#endif NetAddr_h \ No newline at end of file +#endif // NetAddr_h diff --git a/NetEx/NetClient.h b/NetEx/NetClient.h index 932847c..74ea329 100644 --- a/NetEx/NetClient.h +++ b/NetEx/NetClient.h @@ -124,4 +124,4 @@ public: }; -#endif NetClient_h \ No newline at end of file +#endif // NetClient_h diff --git a/NetEx/NetGram.h b/NetEx/NetGram.h index d1831b4..9626f86 100644 --- a/NetEx/NetGram.h +++ b/NetEx/NetGram.h @@ -100,4 +100,4 @@ protected: }; -#endif NetGram_h +#endif // NetGram_h diff --git a/NetEx/NetHost.h b/NetEx/NetHost.h index cf6c255..b81ce2f 100644 --- a/NetEx/NetHost.h +++ b/NetEx/NetHost.h @@ -71,4 +71,4 @@ private: }; -#endif // NET_HOST_H \ No newline at end of file +#endif // NET_HOST_H diff --git a/NetEx/NetLayer.h b/NetEx/NetLayer.h index 49c884e..d2a9528 100644 --- a/NetEx/NetLayer.h +++ b/NetEx/NetLayer.h @@ -67,4 +67,4 @@ private: }; -#endif NetLayer_h \ No newline at end of file +#endif // NetLayer_h diff --git a/NetEx/NetLink.h b/NetEx/NetLink.h index c39a32e..1b861a0 100644 --- a/NetEx/NetLink.h +++ b/NetEx/NetLink.h @@ -134,4 +134,4 @@ protected: }; -#endif NetLink_h \ No newline at end of file +#endif // NetLink_h diff --git a/NetEx/NetMsg.h b/NetEx/NetMsg.h index 072886b..e0c6d1b 100644 --- a/NetEx/NetMsg.h +++ b/NetEx/NetMsg.h @@ -102,4 +102,5 @@ struct NetMsgMultipart { // +-------------------------------------------------------------------+ -#endif NetMsg_h + +#endif // NetMsg_h diff --git a/NetEx/NetPeer.h b/NetEx/NetPeer.h index 4849f2f..c48b69b 100644 --- a/NetEx/NetPeer.h +++ b/NetEx/NetPeer.h @@ -119,4 +119,4 @@ private: }; -#endif NetPeer_h \ No newline at end of file +#endif // NetPeer_h diff --git a/NetEx/NetServer.h b/NetEx/NetServer.h index f0b261f..a2ce126 100644 --- a/NetEx/NetServer.h +++ b/NetEx/NetServer.h @@ -86,4 +86,4 @@ protected: }; -#endif NetServer_h \ No newline at end of file +#endif // NetServer_h diff --git a/NetEx/NetSock.h b/NetEx/NetSock.h index 00444f0..b3f71f4 100644 --- a/NetEx/NetSock.h +++ b/NetEx/NetSock.h @@ -94,4 +94,4 @@ private: }; -#endif NetSock_h \ No newline at end of file +#endif // NetSock_h -- cgit v1.1 From 2af3e7b70b39b18c87883ccb24eb077a96338151 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 23:17:40 +0200 Subject: Separated out msvc cmake configuration --- NetEx/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'NetEx') diff --git a/NetEx/CMakeLists.txt b/NetEx/CMakeLists.txt index c3c6652..5bce174 100644 --- a/NetEx/CMakeLists.txt +++ b/NetEx/CMakeLists.txt @@ -20,10 +20,15 @@ add_library( target_include_directories( NetEx PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - PUBLIC ${WINDOWSSDK_PATH}/um # FIXME - PUBLIC ${WINDOWSSDK_PATH}/shared ) target_link_libraries( NetEx PUBLIC FoundationEx ) +if(MSVC) + target_include_directories( + NetEx + PUBLIC ${WINDOWSSDK_PATH}/um + PUBLIC ${WINDOWSSDK_PATH}/shared + ) +endif() -- cgit v1.1