minor fixes for building

This commit is contained in:
Jacker 2014-01-14 21:33:13 +02:00
parent fa34a3b6ee
commit 8b3d6db6d5
2 changed files with 7 additions and 1 deletions

View file

@ -234,6 +234,12 @@ FILE(GLOB JASPER_SOURCES
"${JASPER_LIB}/*/*.h" "${JASPER_LIB}/*/*.h"
"${JASPER_LIB}/*/*.c" "${JASPER_LIB}/*/*.c"
) )
FILE(GLOB JASPER_SOURCES_REMOVE
"${JASPER_LIB}/jpg/jpg_dummy.c"
)
list(REMOVE_ITEM JASPER_SOURCES ${JASPER_SOURCES_REMOVE})
add_library (jasper STATIC ${JASPER_SOURCES}) add_library (jasper STATIC ${JASPER_SOURCES})
add_dependencies(jasper jpeg) add_dependencies(jasper jpeg)

View file

@ -505,7 +505,7 @@ END
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
#ifdef _WIN32 #ifdef _WIN32
LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252) #pragma code_page(1252)
#endif //_WIN32 #endif //_WIN32