diff --git a/makefiles/virtual/main.c b/makefiles/virtual/main.c deleted file mode 100644 index 511dd2214..000000000 --- a/makefiles/virtual/main.c +++ /dev/null @@ -1,13 +0,0 @@ -#include "../../uCNC/src/cnc.h" - -void main(void) __attribute__((noreturn)); -void main(void) -{ - //initializes all systems - cnc_init(); - - for (;;) - { - cnc_run(); - } -} diff --git a/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp b/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp index d0edb5189..23e71e30e 100644 --- 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 // #pragma comment(lib, "ws2_32.lib") // Winsock Library // #include -#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 index 05f059366..dbb3a4047 100644 --- 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> - - + -<../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 index ee60c5e3b..b729fee89 100644 --- 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" ] )