From 8b3d6db6d5452046bb14049686744cb130c4fb08 Mon Sep 17 00:00:00 2001 From: Jacker Date: Tue, 14 Jan 2014 21:33:13 +0200 Subject: [PATCH] minor fixes for building --- CMakeLists.txt | 6 ++++++ src/EasyGen.rc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13ee73b..289f817 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -234,6 +234,12 @@ FILE(GLOB JASPER_SOURCES "${JASPER_LIB}/*/*.h" "${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_dependencies(jasper jpeg) diff --git a/src/EasyGen.rc b/src/EasyGen.rc index 11b8be4..6f7b97b 100644 --- a/src/EasyGen.rc +++ b/src/EasyGen.rc @@ -505,7 +505,7 @@ END #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) #ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32