- Timestamp:
- Nov 15, 2016, 4:56:20 AM (9 years ago)
- Author:
- Valery V. Sedletski
- Message:
-
build system: Fix broken ufat32.dll build.
- Location:
- branches/fat32-0.10/src
- Files:
-
- 3 deleted
- 2 edited
- ifsinf/fat32.inf (deleted)
- ifsinf/ifs.inf (deleted)
- lib/fat32_0913.wis (deleted)
- makefile.mk (modified) (4 diffs)
- ufat32/makefile.wcc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/fat32-0.10/src/makefile.mk
r160 r161 13 13 $(BLDROOT)\util $(BLDROOT)\ifs $(BLDROOT)\ifs\libc $(BLDROOT)\partfilt $(BLDROOT)\ifsinf 14 14 15 CLEANUP = $(PROJ_BLD)\*.obj $(PROJ_BLD)\*.ob (削除) h (削除ここまで)$(PROJ_BLD)\*.lnk $(PROJ_BLD)\*.wmp &15 CLEANUP = $(PROJ_BLD)\*.obj $(PROJ_BLD)\*.ob(追記) d (追記ここまで) $(PROJ_BLD)\*.lnk $(PROJ_BLD)\*.wmp & 16 16 $(PROJ_BLD)\*.map $(PROJ_BLD)\*.ols $(PROJ_BLD)\*.err $(BLDROOT)\..\include\ver.h & 17 17 $(BLDROOT)\lib\*.lib … … 85 85 86 86 .SUFFIXES: 87 .SUFFIXES: .flt .ifs .dll .exe .lib .lnk .ols .ob (削除) h (削除ここまで).obj .cpp .c .h .asm .sym .map .wmp .inf .ipf .bmp87 .SUFFIXES: .flt .ifs .dll .exe .lib .lnk .ols .ob(追記) d (追記ここまで) .obj .cpp .c .h .asm .sym .map .wmp .inf .ipf .bmp 88 88 89 89 all: $(BLDROOT)\bld.flg $(PROJ_BLD)\makefile.wcc dirs copy targets & … … 193 193 .obj: $(PROJ_BLD) 194 194 195 (追記) .obd: $(PROJ_BLD) (追記ここまで) 196 (追記) (追記ここまで) 195 197 .lnk: $(PROJ_BLD) 196 198 … … 237 239 @$(CC) $(COPT) -fr=$^*.err -fo=$^@ $< 238 240 239 .c.ob (削除) h (削除ここまで): .autodepend241 .c.ob(追記) d (追記ここまで): .autodepend 240 242 @echo CC $^. 241 @$(CC) $(COPT) (削除) (削除ここまで)-d__DLL__ -bd -fr=$^*.err -fo=$^@ $<243 @$(CC) $(COPT) (追記) (追記ここまで)-d__DLL__ -bd -fr=$^*.err -fo=$^@ $< 242 244 243 245 .cpp.obj: .autodepend -
branches/fat32-0.10/src/ufat32/makefile.wcc
r160 r161 12 12 !ifneq T win32 13 13 # create OS/2 binaries 14 OBJS1=$(PROJ_BLD)\ufat32.ob (削除) j $(PROJ_BLD)\sys.obj $(PROJ_BLD)\recover.obj (削除ここまで)&15 $(PROJ_BLD)\format.ob (削除) j $(PROJ_BLD)\os2.obj $(PROJ_BLD)\msg.obj (削除ここまで)&16 $(PROJ_BLD)\chkdsk.ob (削除) j $(PROJ_BLD)\fatfunc.obj (削除ここまで)17 OBJS2=$(PROJ_BLD)\format.ob (削除) h $(PROJ_BLD)\os2.obh $(PROJ_BLD)\msg.obh (削除ここまで)14 OBJS1=$(PROJ_BLD)\ufat32.ob(追記) d $(PROJ_BLD)\sys.obd $(PROJ_BLD)\recover.obd (追記ここまで) & 15 $(PROJ_BLD)\format.ob(追記) d $(PROJ_BLD)\os2.obd $(PROJ_BLD)\msg.obd (追記ここまで) & 16 $(PROJ_BLD)\chkdsk.ob(追記) d $(PROJ_BLD)\fatfunc.obd (追記ここまで) 17 OBJS2=$(PROJ_BLD)\format.ob(追記) j $(PROJ_BLD)\os2.obj $(PROJ_BLD)\msg.obj (追記ここまで) 18 18 COPT=-3s -s -sg -hw -mf -od -zq -q -fp3 -fpi87 -i=. -i=.. -i=..\include -i=$(%WATCOM)\h -i=$(%WATCOM)\h\os2 19 19 TARGETS=$(BINROOT)\os2\dll\ufat32.dll $(BINROOT)\os2\fat32fmt.exe & … … 23 23 # create win32 binaries 24 24 OBJS1= 25 OBJS2=$(PROJ_BLD)\format.ob (削除) h $(PROJ_BLD)\win32.obh (削除ここまで)25 OBJS2=$(PROJ_BLD)\format.ob(追記) j $(PROJ_BLD)\win32.obj (追記ここまで) 26 26 COPT=-3s -sg -hw -mf -od -zq -q -u__OS2__ -i=. -i=.. -i=..\include -i=$(%WATCOM)\h -i=$(%WATCOM)\h\nt 27 27 TARGETS=$(BINROOT)\os2\fat32fmt.exe
Note:
See TracChangeset
for help on using the changeset viewer.