emulator compilation on vscode

Paciente8159 · Nov 14, 2023 · de277d9 · de277d9
1 parent a907301
commit de277d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/makefiles/virtual/main.c b/makefiles/virtual/main.c
diff --git a/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp b/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp
@@ -33,7 +33,7 @@ extern "C"
 // #include <ws2tcpip.h>
 // #pragma comment(lib, "ws2_32.lib") // Winsock Library
 // #include <windows.h>
-#include "WindowsSerial.h"
+#include "../../../../../makefiles/virtual/WindowsSerial.h"
 
 	/**
 	 *

diff --git a/uCNC/src/hal/mcus/virtual/virtual.ini b/uCNC/src/hal/mcus/virtual/virtual.ini
@@ -2,7 +2,7 @@
 # Virtual MCU #
 ###############
 
-[env:windows_virtual]
+[env:EMULATOR_WINDOWS]
 platform = windows_x86
 framework =
 platform_packages = platformio/toolchain-gccmingw32
@@ -11,6 +11,7 @@ build_src_filter =
   +<../makefiles/virtual>
   -<src/tinyusb>
   -<src/hal/mcus/avr>
+  -<../makefiles/virtual/clib>
 debug_build_flags = -Og -g3
 debug_init_cmds =
   run

diff --git a/uCNC/src/hal/mcus/virtual/win_compiler.py b/uCNC/src/hal/mcus/virtual/win_compiler.py
@@ -9,6 +9,8 @@
   LINKFLAGS=[
       "-static-libgcc",
       "-g3",
-	  "-lws2_32"
+      # "-lSDL2main",
+      # "-lSDL2",
+      "-lws2_32"
   ]
 )