Modified JPWL libopenjpeg library by directly embedding the JPWL functions

This commit is contained in:
Giuseppe Baruffa 2007-02-28 23:43:37 +00:00
parent 44ab0ccf01
commit e2a54d9ac6
2 changed files with 31 additions and 31 deletions

View File

@ -50,7 +50,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib LibOpenJPEG_JPWL.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"
!ELSEIF "$(CFG)" == "JPWL_image_to_j2k - Win32 Debug" !ELSEIF "$(CFG)" == "JPWL_image_to_j2k - Win32 Debug"
@ -74,7 +74,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LINK32=link.exe LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib LibOpenJPEG_JPWLd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"
!ENDIF !ENDIF
@ -91,28 +91,12 @@ SOURCE=..\codec\convert.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\crc.c
# End Source File
# Begin Source File
SOURCE=..\codec\compat\getopt.c SOURCE=..\codec\compat\getopt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\codec\image_to_j2k.c SOURCE=..\codec\image_to_j2k.c
# End Source File # End Source File
# Begin Source File
SOURCE=.\jpwl.c
# End Source File
# Begin Source File
SOURCE=.\jpwl_lib.c
# End Source File
# Begin Source File
SOURCE=.\rs.c
# End Source File
# End Group # End Group
# Begin Group "Header Files" # Begin Group "Header Files"
@ -123,24 +107,12 @@ SOURCE=..\codec\convert.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\crc.h
# End Source File
# Begin Source File
SOURCE=..\codec\compat\getopt.h SOURCE=..\codec\compat\getopt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\jpwl.h
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg\openjpeg.h SOURCE=..\libopenjpeg\openjpeg.h
# End Source File # End Source File
# Begin Source File
SOURCE=.\rs.h
# End Source File
# End Group # End Group
# End Target # End Target
# End Project # End Project

View File

@ -72,7 +72,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo # ADD BSC32 /nologo
LIB32=link.exe -lib LIB32=link.exe -lib
# ADD BASE LIB32 /nologo # ADD BASE LIB32 /nologo
# ADD LIB32 /nologo # ADD LIB32 /nologo /out:"Debug\LibOpenJPEG_JPWLd.lib"
!ENDIF !ENDIF
@ -93,6 +93,10 @@ SOURCE=..\libopenjpeg\cio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\crc.c
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg\dwt.c SOURCE=..\libopenjpeg\dwt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -121,6 +125,14 @@ SOURCE=..\libopenjpeg\jpt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\jpwl.c
# End Source File
# Begin Source File
SOURCE=.\jpwl_lib.c
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg\mct.c SOURCE=..\libopenjpeg\mct.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -141,6 +153,10 @@ SOURCE=..\libopenjpeg\raw.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\rs.c
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg\t1.c SOURCE=..\libopenjpeg\t1.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -169,6 +185,10 @@ SOURCE=..\libopenjpeg\cio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\crc.h
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg\dwt.h SOURCE=..\libopenjpeg\dwt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -205,6 +225,10 @@ SOURCE=..\libopenjpeg\jpt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\jpwl.h
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg\mct.h SOURCE=..\libopenjpeg\mct.h
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -229,6 +253,10 @@ SOURCE=..\libopenjpeg\raw.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\rs.h
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg\t1.h SOURCE=..\libopenjpeg\t1.h
# End Source File # End Source File
# Begin Source File # Begin Source File