Merge commit 'origin/master' into emacs
commit
014b664127
13
Makefile
13
Makefile
|
@ -3,6 +3,7 @@ AR = ar
|
|||
LD = ld
|
||||
|
||||
EXECUTABLE = factor
|
||||
CONSOLE_EXECUTABLE = factor_console
|
||||
VERSION = 0.92
|
||||
|
||||
IMAGE = factor.image
|
||||
|
@ -138,9 +139,16 @@ zlib1.dll:
|
|||
|
||||
winnt-x86-32: freetype6.dll zlib1.dll
|
||||
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
|
||||
$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.32
|
||||
$(MAKE) winnt-finish
|
||||
|
||||
winnt-x86-64:
|
||||
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
|
||||
$(MAKE) $(CONSOLE_EXECUTABLE) CONFIG=vm/Config.windows.nt.x86.64
|
||||
$(MAKE) winnt-finish
|
||||
|
||||
winnt-finish:
|
||||
cp misc/factor-cygwin.sh factor
|
||||
|
||||
wince-arm:
|
||||
$(MAKE) $(EXECUTABLE) CONFIG=vm/Config.windows.ce.arm
|
||||
|
@ -161,6 +169,11 @@ factor: $(DLL_OBJS) $(EXE_OBJS)
|
|||
$(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
|
||||
$(CFLAGS) -o $@$(EXE_SUFFIX)$(EXE_EXTENSION) $(EXE_OBJS)
|
||||
|
||||
factor_console: $(DLL_OBJS) $(EXE_OBJS)
|
||||
$(LINKER) $(ENGINE) $(DLL_OBJS)
|
||||
$(CC) $(LIBS) $(LIBPATH) -L. $(LINK_WITH_ENGINE) \
|
||||
$(CFLAGS) $(CFLAGS_CONSOLE) -o $(EXECUTABLE)$(EXE_SUFFIX)$(CONSOLE_EXE_EXTENSION) $(EXE_OBJS)
|
||||
|
||||
clean:
|
||||
rm -f vm/*.o
|
||||
rm -f factor*.dll libfactor.{a,so,dylib}
|
||||
|
|
|
@ -792,7 +792,7 @@ LIBRARY: kernel32
|
|||
! FUNCTION: AddRefActCtx
|
||||
! FUNCTION: AddVectoredExceptionHandler
|
||||
! FUNCTION: AllocateUserPhysicalPages
|
||||
! FUNCTION: AllocConsole
|
||||
FUNCTION: BOOL AllocConsole ( ) ;
|
||||
! FUNCTION: AreFileApisANSI
|
||||
! FUNCTION: AssignProcessToJobObject
|
||||
! FUNCTION: AttachConsole
|
||||
|
@ -1111,7 +1111,7 @@ FUNCTION: BOOL FindVolumeMountPointClose ( HANDLE hFindVolumeMountPoint ) ;
|
|||
! FUNCTION: FoldStringW
|
||||
! FUNCTION: FormatMessageA
|
||||
! FUNCTION: FormatMessageW
|
||||
! FUNCTION: FreeConsole
|
||||
FUNCTION: BOOL FreeConsole ( ) ;
|
||||
! FUNCTION: FreeEnvironmentStringsA
|
||||
FUNCTION: BOOL FreeEnvironmentStringsW ( LPTCH lpszEnvironmentBlock ) ;
|
||||
ALIAS: FreeEnvironmentStrings FreeEnvironmentStringsW
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
#! /bin/sh
|
||||
./factor.com "$@"
|
|
@ -2,6 +2,7 @@ CFLAGS += -DWINDOWS -mno-cygwin
|
|||
LIBS = -lm
|
||||
PLAF_DLL_OBJS += vm/os-windows.o
|
||||
EXE_EXTENSION=.exe
|
||||
CONSOLE_EXE_EXTENSION=.com
|
||||
DLL_EXTENSION=.dll
|
||||
LINKER = $(CC) -shared -mno-cygwin -o
|
||||
LINK_WITH_ENGINE = -l$(DLL_PREFIX)factor$(DLL_SUFFIX)
|
||||
|
|
|
@ -4,5 +4,6 @@ DLL_SUFFIX=
|
|||
PLAF_DLL_OBJS += vm/os-windows-nt.o
|
||||
PLAF_EXE_OBJS += vm/resources.o
|
||||
PLAF_EXE_OBJS += vm/main-windows-nt.o
|
||||
#CFLAGS += -mwindows
|
||||
CFLAGS += -mwindows
|
||||
CFLAGS_CONSOLE += -mconsole
|
||||
include vm/Config.windows
|
||||
|
|
|
@ -54,14 +54,4 @@ void c_to_factor_toplevel(CELL quot)
|
|||
|
||||
void open_console(void)
|
||||
{
|
||||
/*
|
||||
// Do this: http://www.cygwin.com/ml/cygwin/2007-11/msg00432.html
|
||||
if(console_open)
|
||||
return;
|
||||
|
||||
if(AttachConsole(ATTACH_PARENT_PROCESS) || AllocConsole())
|
||||
{
|
||||
console_open = true;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
|
|
@ -18,5 +18,4 @@ typedef char F_SYMBOL;
|
|||
|
||||
void c_to_factor_toplevel(CELL quot);
|
||||
long exception_handler(PEXCEPTION_POINTERS pe);
|
||||
bool console_open;
|
||||
void open_console(void);
|
||||
|
|
Loading…
Reference in New Issue