Fix io.launcher on Windows -- Microsoft does the same thing with devenv
parent
489019acd0
commit
eec86d6043
12
Makefile
12
Makefile
|
@ -130,18 +130,20 @@ solaris-x86-64:
|
||||||
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.solaris.x86.64
|
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.solaris.x86.64
|
||||||
|
|
||||||
freetype6.dll:
|
freetype6.dll:
|
||||||
wget http://factorcode.org/dlls/freetype6.dll
|
wget $(DLL_PATH)/freetype6.dll
|
||||||
chmod 755 freetype6.dll
|
chmod 755 freetype6.dll
|
||||||
|
|
||||||
zlib1.dll:
|
zlib1.dll:
|
||||||
wget http://factorcode.org/dlls/zlib1.dll
|
wget $(DLL_PATH)/zlib1.dll
|
||||||
chmod 755 zlib1.dll
|
chmod 755 zlib1.dll
|
||||||
|
|
||||||
winnt-x86-32: freetype6.dll zlib1.dll
|
windows-dlls: freetype6.dll zlib1.dll
|
||||||
|
|
||||||
|
winnt-x86-32: windows-dlls
|
||||||
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
|
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
|
||||||
$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
|
$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
|
||||||
|
|
||||||
winnt-x86-64:
|
winnt-x86-64: windows-dlls
|
||||||
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
|
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
|
||||||
$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
|
$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
|
||||||
|
|
||||||
|
@ -167,7 +169,7 @@ factor: $(DLL_OBJS) $(EXE_OBJS)
|
||||||
factor-console: $(DLL_OBJS) $(EXE_OBJS)
|
factor-console: $(DLL_OBJS) $(EXE_OBJS)
|
||||||
$(LINKER) $(ENGINE) $(DLL_OBJS)
|
$(LINKER) $(ENGINE) $(DLL_OBJS)
|
||||||
$(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
|
$(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
|
||||||
$(CFLAGS) $(CFLAGS_CONSOLE) -o $@$(EXE_SUFFIX)$(EXE_EXTENSION) $(EXE_OBJS)
|
$(CFLAGS) $(CFLAGS_CONSOLE) -o factor$(EXE_SUFFIX)$(CONSOLE_EXTENSION) $(EXE_OBJS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f vm/*.o
|
rm -f vm/*.o
|
||||||
|
|
|
@ -2,6 +2,7 @@ CFLAGS += -DWINDOWS -mno-cygwin
|
||||||
LIBS = -lm
|
LIBS = -lm
|
||||||
PLAF_DLL_OBJS += vm/os-windows.o
|
PLAF_DLL_OBJS += vm/os-windows.o
|
||||||
EXE_EXTENSION=.exe
|
EXE_EXTENSION=.exe
|
||||||
|
CONSOLE_EXTENSION=.com
|
||||||
DLL_EXTENSION=.dll
|
DLL_EXTENSION=.dll
|
||||||
LINKER = $(CC) -shared -mno-cygwin -o
|
LINKER = $(CC) -shared -mno-cygwin -o
|
||||||
LINK_WITH_ENGINE = -l$(DLL_PREFIX)factor$(DLL_SUFFIX)
|
LINK_WITH_ENGINE = -l$(DLL_PREFIX)factor$(DLL_SUFFIX)
|
||||||
|
|
|
@ -6,4 +6,5 @@ PLAF_EXE_OBJS += vm/resources.o
|
||||||
PLAF_EXE_OBJS += vm/main-windows-nt.o
|
PLAF_EXE_OBJS += vm/main-windows-nt.o
|
||||||
CFLAGS += -mwindows
|
CFLAGS += -mwindows
|
||||||
CFLAGS_CONSOLE += -mconsole
|
CFLAGS_CONSOLE += -mconsole
|
||||||
|
CONSOLE_EXTENSION = .com
|
||||||
include vm/Config.windows
|
include vm/Config.windows
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
DLL_PATH=http://factorcode.org/dlls
|
||||||
WINDRES=windres
|
WINDRES=windres
|
||||||
include vm/Config.windows.nt
|
include vm/Config.windows.nt
|
||||||
include vm/Config.x86.32
|
include vm/Config.x86.32
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
DLL_PATH=http://factorcode.org/dlls/64
|
||||||
CC=$(WIN64_PATH)-gcc.exe
|
CC=$(WIN64_PATH)-gcc.exe
|
||||||
WINDRES=$(WIN64_PATH)-windres.exe
|
WINDRES=$(WIN64_PATH)-windres.exe
|
||||||
include vm/Config.windows.nt
|
include vm/Config.windows.nt
|
||||||
|
|
|
@ -109,17 +109,6 @@ const F_CHAR *default_image_path(void)
|
||||||
snwprintf(temp_path, sizeof(temp_path)-1, L"%s.image", full_path);
|
snwprintf(temp_path, sizeof(temp_path)-1, L"%s.image", full_path);
|
||||||
temp_path[sizeof(temp_path) - 1] = 0;
|
temp_path[sizeof(temp_path) - 1] = 0;
|
||||||
|
|
||||||
if(!windows_stat(temp_path)) {
|
|
||||||
unsigned int len = wcslen(full_path);
|
|
||||||
F_CHAR magic[] = L"-console";
|
|
||||||
unsigned int magic_len = wcslen(magic);
|
|
||||||
|
|
||||||
if(!wcsncmp(full_path + len - magic_len, magic, MIN(len, magic_len)))
|
|
||||||
full_path[len - magic_len] = 0;
|
|
||||||
snwprintf(temp_path, sizeof(temp_path)-1, L"%s.image", full_path);
|
|
||||||
temp_path[sizeof(temp_path) - 1] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return safe_strdup(temp_path);
|
return safe_strdup(temp_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue