-CFLAGS += -DWINDOWS -mno-cygwin
-LIBS = -lm
-PLAF_DLL_OBJS += vm/os-windows.o
+SITE_CFLAGS += -mwindows
+CFLAGS_CONSOLE += -mconsole
SHARED_FLAG = -shared
+SHARED_DLL_EXTENSION=.dll
+
+LIBS = -lm
+
+PLAF_DLL_OBJS += vm/os-windows.o vm/mvm-windows.o
+PLAF_EXE_OBJS += vm/resources.o vm/main-windows.o
+PLAF_MASTER_HEADERS += vm/os-windows.hpp
+
+EXE_SUFFIX=
EXE_EXTENSION=.exe
-CONSOLE_EXTENSION=.com
+DLL_SUFFIX=
DLL_EXTENSION=.dll
-SHARED_DLL_EXTENSION=.dll
-LINKER = $(CPP) -shared -mno-cygwin -o
+CONSOLE_EXTENSION=.com
+
+LINKER = $(CPP) -shared -o
LINK_WITH_ENGINE = -l$(DLL_PREFIX)factor$(DLL_SUFFIX)