Changeset 1897
- Timestamp:
- Aug 14, 2022, 9:14:53 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/init.c
r1891 r1897 853 853 pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__); 854 854 // Check free space on TMP and FM2 Save drives 855 #ifdef FM4_NOWARN_DSPACE //Quiet FM/4 for AN main frame backup solution 856 if (strcmp(appname, "FM/4")) 857 #endif 855 858 { 856 859 if (pTmpDir && CheckDriveSpaceAvail(pTmpDir, ullTmpSpaceNeeded, 0) == 1) { -
trunk/dll/makefile
r1890 r1897 105 105 !endif 106 106 107 !ifdef %FM4_NOWARN_DSPACE # if defined in environment 108 FM4_NOWARN_DSPACE = $(%FM4_NOWARN_DSPACE) # use value from environment 109 !endif 110 107 111 # Keep this code in sync with makefile_post.mk 108 112 !ifndef NOHIGHMEM … … 168 172 !endif 169 173 174 !ifdef FM4_NOWARN_DSPACE 175 CFLAGS += -dFM4_NOWARN_DSPACE 176 !endif 177 170 178 # for fm3res only 171 179 CFLAGSR = -bt=os2 -mf -bd -bm -olirs -s -j -we -wx -zfp -zgp -zp4 -zq -
trunk/makefile
r1890 r1897 33 33 # 13 Aug 11 GKY Build xqs and sym files as part of dll and all targets 34 34 # 25 Jan 20 SHL Add PMPRINTF support - PMPRINTF_OPT 35 # 06 Aug 22 GKY Add FM4_NOWARN_DSPACE - FM4_NOWARN_DSPACE_OPT 35 36 36 37 # Environment - see makefile_pre.mk and dll\makefile … … 73 74 dll: .symbolic 74 75 cd dll 75 $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) 76 $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) $(FM4_NOWARN_DSPACE) 76 77 cd .. 77 78 78 79 dllsyms: .symbolic 79 80 cd dll 80 $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) syms81 $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) $(FM4_NOWARN_DSPACE) syms 81 82 cd .. 82 83 … … 90 91 91 92 allexe: *.mak .symbolic 92 @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) 93 @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) $(FM4_NOWARN_DSPACE) 93 94 94 95 # make SYM files 95 96 96 97 exesyms: *.mak .symbolic 97 @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) sym98 @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) $(FM4_NOWARN_DSPACE) sym 98 99 99 100 # make WPI files … … 110 111 lxliteexe: *.mak .symbolic 111 112 !ifndef DEBUG 112 @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) lxlite113 @for %f in ($<) do $(MAKE) -h -f %f $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) $(FM4_NOWARN_DSPACE) lxlite 113 114 !endif 114 115 … … 119 120 $(MAKE) -h lxlite 120 121 # FIXME to be gone 121 # $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) lxlite122 # $(MAKE) -h $(__MAKEOPTS__) $(DEBUG_OPT) $(FORTIFY_OPT) $(PMPRINTF_OPT) $(FM4_NOWARN_DSPACE) lxlite 122 123 cd .. 123 124 !endif -
trunk/makefile_pre.mk
r1890 r1897 17 17 # 14 Aug 15 SHL Test hll debug - FIXME to be gone 18 18 # 25 Jan 20 SHL Add PMPRINTF support - PMPRINTF_OPT CFLAGS 19 # 06 Aug 22 GKY Add FM4_NOWARN_DSPACE 19 20 20 21 # Environment: see dll\makefile … … 69 70 PMPRINTF = $(%PMPRINTF) # use value from environment 70 71 PMPRINTF_OPT = PMPRINTF=$(PMPRINTF) # set in case needed by sub-make 72 !endif 73 !endif 74 75 !ifdef FM4_NOWARN_DSPACE # if defined on wmake command line 76 FM4_NOWARN_DSPACE_OPT = FM4_NOWARN_DSPACE=$(FM4_NOWARN_DSPACE) # set in case needed by sub-make 77 !else 78 !ifdef %FM4_NOWARN_DSPACE 79 FM4_NOWARN_DSPACE = $(%FM4_NOWARN_DSPACE) # use value from environment 80 FM4_NOWARN_DSPACE_OPT = FM4_NOWARN_DSPACE=$(FM4_NOWARN_DSPACE) # set in case needed by sub-make 71 81 !endif 72 82 !endif
Note:
See TracChangeset
for help on using the changeset viewer.