switch to using icl by default
This commit is contained in:
parent
7ebc7596d4
commit
4c139339e2
@ -1,4 +1,4 @@
|
|||||||
LIBRARY LIBBZ2
|
LIBRARY
|
||||||
DESCRIPTION "libbzip2: library for data compression"
|
DESCRIPTION "libbzip2: library for data compression"
|
||||||
EXPORTS
|
EXPORTS
|
||||||
BZ2_bzCompressInit
|
BZ2_bzCompressInit
|
||||||
|
31
makefile.vc
31
makefile.vc
@ -3,11 +3,13 @@
|
|||||||
# Gabi Davar (grizzly.nyo@gmail.com)
|
# Gabi Davar (grizzly.nyo@gmail.com)
|
||||||
# Fixed up by JRS for bzip2-0.9.5d release.
|
# Fixed up by JRS for bzip2-0.9.5d release.
|
||||||
|
|
||||||
#CC:=icl
|
CC=icl
|
||||||
|
CFLAGS= -nologo -MP -MD -Z7 -Qvc9 -arch:SSE3 -O2 -DWIN32 -D_FILE_OFFSET_BITS=64 -D_CRT_SECURE_NO_WARNINGS -DBUILD_BZIP2_DLL
|
||||||
|
#CFLAGS= -nologo -MP -MD -Z7 -Qvc9 -QxAVX -O2 -Oi -DWIN32 -D_FILE_OFFSET_BITS=64 -D_CRT_SECURE_NO_WARNINGS -DBUILD_BZIP2_DLL
|
||||||
#CFLAGS= -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo
|
#CFLAGS= -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -nologo
|
||||||
#CFLAGS= -Qopenmp -Qmkl:parallel -nologo -MP -MD -Qvc9 -fp:precise -arch:SSSE3 -QaxAVX -O3 -D _CRT_SECURE_NO_WARNINGS -D WIN32 -D _UNICODE -D UNICODE -D __INTEL_COMPILER=1300
|
#CFLAGS= -Qopenmp -Qmkl:parallel -nologo -MP -MD -Qvc9 -fp:precise -arch:SSSE3 -QaxAVX -O3 -D _CRT_SECURE_NO_WARNINGS -D WIN32 -D _UNICODE -D UNICODE -D __INTEL_COMPILER=1300
|
||||||
#CC=cl
|
#CC=cl
|
||||||
CFLAGS= -nologo -MP -Z7 -DBUILD_BZIP2_DLL -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -D_CRT_SECURE_NO_WARNINGS
|
#CFLAGS= -nologo -MP -Z7 -DBUILD_BZIP2_DLL -DWIN32 -MD -Ox -D_FILE_OFFSET_BITS=64 -D_CRT_SECURE_NO_WARNINGS
|
||||||
EXECFLAGS= -nologo -MP -Z7 -MD -Ox -D_CRT_SECURE_NO_WARNINGS
|
EXECFLAGS= -nologo -MP -Z7 -MD -Ox -D_CRT_SECURE_NO_WARNINGS
|
||||||
RFLAGS= /nologo /d _UNICODE /d UNICODE /l"0x0409" /d ARCH=\"$(ARCH)\" /d MSVCVER=\"$(MSVCVER)\"
|
RFLAGS= /nologo /d _UNICODE /d UNICODE /l"0x0409" /d ARCH=\"$(ARCH)\" /d MSVCVER=\"$(MSVCVER)\"
|
||||||
|
|
||||||
@ -37,10 +39,10 @@ bzip2recover.exe:
|
|||||||
$(CC) $(EXECFLAGS) /Fe$@ bzip2recover.c
|
$(CC) $(EXECFLAGS) /Fe$@ bzip2recover.c
|
||||||
|
|
||||||
libbz2-static.lib: $(OBJS)
|
libbz2-static.lib: $(OBJS)
|
||||||
lib -nologo -out:$@ $(OBJS)
|
xilib -nologo -out:$@ $(OBJS)
|
||||||
|
|
||||||
$(DLLNAME): $(OBJS) libbz2.res
|
$(DLLNAME): $(OBJS) libbz2.res
|
||||||
link -NOLOGO -NXCOMPAT -IMPLIB:libbz2.lib -RELEASE -DLL $** $(INTEL_LIBS) -OUT:$@ -MANIFEST -MANIFESTFILE:"$@.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'"
|
xilink -NOLOGO -DEBUG -NXCOMPAT -IMPLIB:libbz2.lib -RELEASE -DLL $** $(INTEL_LIBS) -OUT:$@ -MANIFEST -MANIFESTFILE:"$@.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'"
|
||||||
mt.exe /nologo /verbose /outputresource:"$@;#2" /manifest $@.intermediate.manifest
|
mt.exe /nologo /verbose /outputresource:"$@;#2" /manifest $@.intermediate.manifest
|
||||||
|
|
||||||
test: bzip2.exe
|
test: bzip2.exe
|
||||||
@ -65,14 +67,13 @@ test: bzip2.exe
|
|||||||
fc sample3.tst sample3.ref
|
fc sample3.tst sample3.ref
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
del *.obj
|
-del *.obj
|
||||||
del *.dll
|
-del *.dll
|
||||||
del *.lib
|
-del *.lib
|
||||||
del *.exe
|
-del *.exe
|
||||||
del sample1.rb2
|
-del *.exp
|
||||||
del sample2.rb2
|
-del *.pdb
|
||||||
del sample3.rb2
|
-del *.ilk
|
||||||
del sample1.tst
|
-del *.rb2
|
||||||
del sample2.tst
|
-del *.tst
|
||||||
del sample3.tst
|
-del *.manifest
|
||||||
|
|
Loading…
Reference in New Issue
Block a user