Mercurial > install
changeset 9:bd8f2c281cae
Merge with OS/2 changes.
author | Brian Smith <brian@dbsoft.org> |
---|---|
date | Sun, 20 Nov 2011 11:11:53 -0600 |
parents | d399eef87cc5 (current diff) 308a1e4d2f8d (diff) |
children | dd61d68f3b75 |
files | |
diffstat | 2 files changed, 33 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/packace/unace.c Sun Nov 20 11:11:10 2011 -0600 +++ b/packace/unace.c Sun Nov 20 11:11:53 2011 -0600 @@ -571,7 +571,7 @@ #if !defined(__EMX__) && !defined(__OS2__) fclose(farchan); #endif - close(archan); + //close(archan); if (f_err) { pipeit("\nError occurred\n");
--- a/sfxace/makefile.vc Sun Nov 20 11:11:10 2011 -0600 +++ b/sfxace/makefile.vc Sun Nov 20 11:11:53 2011 -0600 @@ -2,7 +2,7 @@ # # Configure settings for the target platform -# Default to x86 if not specified +# Default to x86 if not specified # !if "$(TARGET_CPU)" == "" TARGET_CPU=x86 @@ -10,53 +10,55 @@ !if "$(TARGET_CPU)" == "x86" PLATFORM_DEF = -DWIN32 +REXXLIB = 32\rexx.lib !else PLATFORM_DEF = -DWIN64 -DWIN32 +REXXLIB = rexx.lib !endif CC = cl CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DENABLE_LOGGING -I. -I.. -I..\incace -I..\platform -I"$(REGINA_LANG_DIR)\include" CFLAGS_DEBUG = -Zi CFLAGS_COMPILE = -MT -LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib msimg32.lib userenv.lib "$(REGINA_LANG_DIR)\lib\rexx.lib" +LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib msimg32.lib userenv.lib "$(REGINA_LANG_DIR)\lib\$(REXXLIB)" RES = LINKFLAGS = -machine:$(TARGET_CPU) -debug -debugtype:cv DLLLINKFLAGS = -dll LINK = link -OBJS = globals.obj \ - uac_comm.obj \ - uac_crc.obj \ - uac_crt.obj \ - uac_dcpr.obj \ - uac_sys.obj \ - unace.obj \ - ..\win\dirent.obj \ - ..\win\dw.obj \ - ..\install.obj \ - ..\rexx.obj \ - ..\instsup.obj \ - ..\win32sup.obj +OBJS = globals.obj \ + uac_comm.obj \ + uac_crc.obj \ + uac_crt.obj \ + uac_dcpr.obj \ + uac_sys.obj \ + unace.obj \ + ..\win\dirent.obj \ + ..\win\dw.obj \ + ..\install.obj \ + ..\rexx.obj \ + ..\instsup.obj \ + ..\win32sup.obj -LINKOBJS = globals.obj \ - uac_comm.obj \ - uac_crc.obj \ - uac_crt.obj \ - uac_dcpr.obj \ - uac_sys.obj \ - unace.obj \ - dirent.obj \ - dw.obj \ - install.obj \ - rexx.obj \ - instsup.obj \ - win32sup.obj +LINKOBJS = globals.obj \ + uac_comm.obj \ + uac_crc.obj \ + uac_crt.obj \ + uac_dcpr.obj \ + uac_sys.obj \ + unace.obj \ + dirent.obj \ + dw.obj \ + install.obj \ + rexx.obj \ + instsup.obj \ + win32sup.obj all: sfxwin.exe clean: - -erase *.dll + -erase *.dll -erase *.exe -erase *.opt -erase *.lib @@ -70,7 +72,7 @@ sfxwin.exe: $(OBJS) sfxwin.res $(LINK) @<< --out:$(@) -subsystem:windows -entry:WinMainCRTStartup +-out:$(@) -subsystem:windows $(LINKFLAGS) $(LINKOBJS) $(LIBS)