[Fix] remove semicolon (#118)

* [Fix] remove semicolon

* [Build] builds now on windows, program doesnt work

* [Fix] add missing semicolon

* [Fix] path

Author: nydragon

Diff for: .github/workflows/build_windows.yml

@@ -20,19 +20,22 @@ jobs:
       - name: create-conan-profile
         shell: powershell
         # Generates default profile detecting GCC and sets old ABI
-        run: conan profile new default --detect;
+        run: >
+          conan profile new default --detect;
+          conan profile update conf.tools.system.package_manager:mode=install default;
+          conan profile update conf.tools.system.package_manager:sudo=True default;
+
 
       # Build project
       - name: build
         shell: powershell
         run: >
-          conan profile update conf.tools.system.package_manager:mode=install default;
-          conan profile update conf.tools.system.package_manager:sudo=True default;
-          mkdir build;
-          make build;
+          conan install conanfile.txt -if build --build=missing;
+          cmake -S . -B build;
+          cmake --build build;
 
       - name: verify-files
         shell: bash
         run: >
-          rm ./bin/Client;
-          rm ./bin/Server;
+          rm ./build/bin/Client;
+          rm ./build/bin/Server;

Diff for: CMakeLists.txt

@@ -8,6 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 if (MSVC)
     set (CMAKE_GENERATOR "Visual Studio 17" CACHE INTERNAL "" FORCE)
     add_compile_definitions(WIN32_LEAN_AND_MEAN)
+    add_compile_definitions(-D_WIN32_WINNT=0x0601)
 else()
     set (CMAKE_GENERATOR "Unix Makefiles" CACHE INTERNAL "" FORCE)
     add_compile_options(-g3)

Diff for: Makefile

@@ -4,7 +4,7 @@ BUILD = build
 
 build: normdir conan
 	cmake -S . -B $(BUILD);
-	cmake --build $(BUILD)
+	cmake --build $(BUILD);
 
 test: testdir conan
 	cmake -S . -B $(BUILD) -DTESTMODE=1;
@@ -21,7 +21,7 @@ normdir:
 	$(eval BUILD="build")
 
 conan:
-	conan install conanfile.txt -if $(BUILD) --build=missing;
+	conan install conanfile.txt -if $(BUILD) --build=missing
 
 cleanbuild: normdir clean
 

Diff for: README.md

@@ -63,15 +63,13 @@ $ cmake --build . --config Release
 Delete the build folder if present:
 
 ```
-$ Remove-Item 'build' -Recurse
+rmdir /s build
 ```
 
 Then build the binaries:
 
 ```
-$ New-item -itemtype directory build
-$ Set-Location build
-$ conan install . --build=missing
-$ cmake .. -G "Visual Studio 17"
-$ cmake --build . --config Release
+conan install conanfile.txt -if build --build=missing
+cmake -S . -B build
+cmake --build build
 ```

Diff for: src/WindowsGuard.hpp

@@ -67,6 +67,7 @@ typedef struct tagBITMAPINFOHEADER {
     DWORD biClrImportant;
 } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
 
+
 #include <mmreg.h>
 #include <mmsystem.h>
 #include <objbase.h>

Diff for: src/client/Protocols/ClientGameProtocol.cpp

@@ -5,6 +5,9 @@
 ** .
 */
 
+
+#include "../../WindowsGuard.hpp"
+
 #include "ClientGameProtocol.hpp"
 #include "../../shared/Utilities/Utilities.hpp"
 

Diff for: src/server/Systems/Factory.cpp

@@ -71,7 +71,7 @@ EntityID Factory::Enemy::makeEnemy(std::shared_ptr<ECSManager> ECS) {
     const float startX = WINDOW_WIDTH;
     const float startY = rand() % (int)WINDOW_HEIGHT;
 
-    Position::Component* position = ECS->addComp<Position::Component>(enemy, {x : startX, y : startY});
+    Position::Component* position = ECS->addComp<Position::Component>(enemy, {startX, startY});
     Animation::Component* animation = ECS->addComp<Animation::Component>(enemy, {Animation::AnimationID::Orb, 3});
 
     ECS->addComp<Velocity::Component>(enemy, {-10, 0});

Diff for: src/shared/Networking/UdpCommunication.cpp

@@ -78,7 +78,7 @@ void UdpCommunication::setup_incoming_handler() {
             // Reset buffer
             memset(this->_buffer, 0, 1024);
 
-            std::cerr << "Error performing async_receive_from()" << std::endl;
+            std::cerr << "Error performing async_receive_from()" << err << std::endl;
             this->setup_incoming_handler();
         }
     });

Diff for: src/shared/Utilities/Utilities.hpp

@@ -19,6 +19,8 @@
 #endif
 #endif
 
+#include "../../WindowsGuard.hpp"
+
 #define ERROR(msg) std::cout << REDL << "[ERROR]   " << __FUNCTION_NAME__ << ": " << msg << NC << std::endl
 #define WARNING(msg) std::cout << "[WARNING] " << __FUNCTION_NAME__ << ": " << msg << std::endl
 #define LOG(msg) std::cout << "[LOG]     " << __FUNCTION_NAME__ << ": " << msg << std::endl