Changeset 11504
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r11503 r11504 421 421 # Manipulate config file based on given parameters and read unset parameters 422 422 423 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled WITH_EMU OUTPUT_VARIABLE CONFIG_WITH_EMU OUTPUT_STRIP_TRAILING_WHITESPACE)424 if (CONFIG_WITH_EMU MATCHES "Y" AND NOT WITH_EMU EQUAL 1)425 add_definitions ("-DWITH_EMU")426 set (WITH_EMU "1")427 message (STATUS " EMU is added by config compiling with EMU")428 endif (CONFIG_WITH_EMU MATCHES "Y" AND NOT WITH_EMU EQUAL 1)429 430 if (WITH_EMU)431 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --enabled WITH_SOFTCAM OUTPUT_VARIABLE CONFIG_WITH_SOFTCAM OUTPUT_STRIP_TRAILING_WHITESPACE)432 if (CONFIG_WITH_SOFTCAM MATCHES "Y" AND NOT WITH_SOFTCAM EQUAL 1)433 add_definitions ("-DWITH_SOFTCAM")434 set (WITH_SOFTCAM "1")435 message (STATUS " SOFTCAM is added by config linking SoftCam.Key")436 endif (CONFIG_WITH_SOFTCAM MATCHES "Y" AND NOT WITH_SOFTCAM EQUAL 1)437 endif (WITH_EMU)438 439 423 execute_process (COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/config.sh --show-valid OUTPUT_VARIABLE config_vars_string OUTPUT_STRIP_TRAILING_WHITESPACE) 440 424 string(REGEX MATCHALL "[A-Z0-9_]+" config_vars ${config_vars_string}) … … 754 738 #-------------------------------------------------------------------------------- 755 739 756 if (NOT OSCamOperatingSystem MATCHES "Mac OS X")757 if (NOT DEFINED ENV{ANDROID_NDK})758 if (NOT DEFINED ENV{ANDROID_STANDALONE_TOOLCHAIN})759 if (WITH_SOFTCAM)760 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key)761 execute_process (COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key ${CMAKE_CURRENT_BINARY_DIR}/SoftCam.Key)762 else (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key)763 execute_process (COMMAND touch ${CMAKE_CURRENT_BINARY_DIR}/SoftCam.Key)764 endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/SoftCam.Key)765 set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--format=binary -Wl,SoftCam.Key -Wl,--format=default")766 endif (WITH_SOFTCAM)767 endif (NOT DEFINED ENV{ANDROID_STANDALONE_TOOLCHAIN})768 endif (NOT DEFINED ENV{ANDROID_NDK})769 endif (NOT OSCamOperatingSystem MATCHES "Mac OS X")770 771 740 #----------------------- installation ----------------------------- 772 741 … … 857 826 endif (HAVE_LIBUSB) 858 827 859 if (WITH_EMU)860 message (STATUS " Compile with EMU support")861 if (WITH_SOFTCAM)862 message (STATUS " SoftCam.Key will be linked as well")863 endif (WITH_SOFTCAM)864 endif (WITH_EMU)865 866 828 message (STATUS "") -
trunk/Makefile
r11503 r11504 272 272 SRC-$(CONFIG_MODULE_CCCSHARE) += module-cccshare.c 273 273 SRC-$(CONFIG_MODULE_CONSTCW) += module-constcw.c 274 SRC-$(CONFIG_WITH_EMU) += module-emulator.c275 ifeq "$(CONFIG_WITH_EMU)" "y"276 ifeq "$(CONFIG_WITH_SOFTCAM)" "y"277 UNAME := $(shell uname -s)278 ifneq ($(UNAME),Darwin)279 ifndef ANDROID_NDK280 ifndef ANDROID_STANDALONE_TOOLCHAIN281 TOUCH_SK := $(shell touch SoftCam.Key)282 override LDFLAGS += -Wl,--format=binary -Wl,SoftCam.Key -Wl,--format=default283 endif284 endif285 endif286 endif287 endif288 274 SRC-$(CONFIG_CS_CACHEEX) += module-csp.c 289 275 SRC-$(CONFIG_CW_CYCLE_CHECK) += module-cw-cycle-check.c -
trunk/config.h
r11503 r11504 2 2 #define CONFIG_H_ 3 3 4 #define WITH_EMU 15 #define WITH_SOFTCAM 16 4 #define WEBIF 1 7 5 #define WEBIF_LIVELOG 1 -
trunk/config.sh
r11503 r11504 1 1 #!/bin/sh 2 2 3 addons="WEBIF WEBIF_LIVELOG WEBIF_JQUERY TOUCH WITH_SSL HAVE_DVBAPI WITH_NEUTRINO READ_SDT_CHARSETS IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_LB CS_CACHEEX CW_CYCLE_CHECK LCDSUPPORT LEDSUPPORT CLOCKFIX IPV6SUPPORT WITH_EMU WITH_SOFTCAM"3 addons="WEBIF WEBIF_LIVELOG WEBIF_JQUERY TOUCH WITH_SSL HAVE_DVBAPI WITH_NEUTRINO READ_SDT_CHARSETS IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_LB CS_CACHEEX CW_CYCLE_CHECK LCDSUPPORT LEDSUPPORT CLOCKFIX IPV6SUPPORT" 4 4 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_GBOX MODULE_RADEGAST MODULE_SCAM MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA MODULE_GHTTP" 5 5 readers="READER_NAGRA READER_NAGRA_MERLIN READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG READER_BULCRYPT READER_GRIFFIN READER_DGCRYPT" … … 26 26 # CONFIG_CLOCKFIX=n 27 27 # CONFIG_IPV6SUPPORT=n 28 # CONFIG_WITH_EMU=n29 # CONFIG_WITH_SOFTCAM=n30 28 # CONFIG_MODULE_CAMD33=n 31 29 CONFIG_MODULE_CAMD35=y … … 295 293 update_deps() { 296 294 # Calculate dependencies 297 enabled_any $(get_opts readers) $(get_opts card_readers) WITH_EMU&& enable_opt WITH_CARDREADER >/dev/null298 disabled_all $(get_opts readers) $(get_opts card_readers) WITH_EMU&& disable_opt WITH_CARDREADER >/dev/null295 enabled_any $(get_opts readers) $(get_opts card_readers) && enable_opt WITH_CARDREADER >/dev/null 296 disabled_all $(get_opts readers) $(get_opts card_readers) && disable_opt WITH_CARDREADER >/dev/null 299 297 disabled WEBIF && disable_opt WEBIF_LIVELOG >/dev/null 300 298 disabled WEBIF && disable_opt WEBIF_JQUERY >/dev/null 301 299 enabled MODULE_CCCSHARE && enable_opt MODULE_CCCAM >/dev/null 302 300 enabled_any CARDREADER_DB2COM CARDREADER_MP35 CARDREADER_SC8IN1 CARDREADER_STINGER && enable_opt CARDREADER_PHOENIX >/dev/null 303 enabled WITH_EMU && enable_opt READER_VIACCESS >/dev/null304 enabled WITH_EMU && enable_opt READER_DRE >/dev/null305 enabled WITH_EMU && enable_opt MODULE_NEWCAMD >/dev/null306 disabled WITH_EMU && disable_opt WITH_SOFTCAM >/dev/null307 301 } 308 302 … … 354 348 enabled MODULE_CCCAM && echo "CONFIG_LIB_RC6=y" || echo "# CONFIG_LIB_RC6=n" 355 349 not_have_flag USE_LIBCRYPTO && enabled MODULE_CCCAM && echo "CONFIG_LIB_SHA1=y" || echo "# CONFIG_LIB_SHA1=n" 356 enabled_any READER_DRE MODULE_SCAM READER_VIACCESS READER_NAGRA_MERLIN WITH_EMU&& echo "CONFIG_LIB_DES=y" || echo "# CONFIG_LIB_DES=n"357 enabled_any MODULE_CCCAM READER_NAGRA READER_NAGRA_MERLIN READER_SECA WITH_EMU&& echo "CONFIG_LIB_IDEA=y" || echo "# CONFIG_LIB_IDEA=n"358 not_have_flag USE_LIBCRYPTO && enabled_any READER_CONAX READER_CRYPTOWORKS READER_NAGRA READER_NAGRA_MERLIN WITH_EMU&& echo "CONFIG_LIB_BIGNUM=y" || echo "# CONFIG_LIB_BIGNUM=n"350 enabled_any READER_DRE MODULE_SCAM READER_VIACCESS READER_NAGRA_MERLIN && echo "CONFIG_LIB_DES=y" || echo "# CONFIG_LIB_DES=n" 351 enabled_any MODULE_CCCAM READER_NAGRA READER_NAGRA_MERLIN READER_SECA && echo "CONFIG_LIB_IDEA=y" || echo "# CONFIG_LIB_IDEA=n" 352 not_have_flag USE_LIBCRYPTO && enabled_any READER_CONAX READER_CRYPTOWORKS READER_NAGRA READER_NAGRA_MERLIN && echo "CONFIG_LIB_BIGNUM=y" || echo "# CONFIG_LIB_BIGNUM=n" 359 353 enabled READER_NAGRA_MERLIN && echo "CONFIG_LIB_MDC2=y" || echo "# CONFIG_LIB_MDC2=n" 360 354 enabled READER_NAGRA_MERLIN && echo "CONFIG_LIB_FAST_AES=y" || echo "# CONFIG_LIB_FAST_AES=n" … … 472 466 CLOCKFIX "Clockfix (disable on old systems!)" $(check_test "CLOCKFIX") \ 473 467 IPV6SUPPORT "IPv6 support (experimental)" $(check_test "IPV6SUPPORT") \ 474 WITH_EMU "Emulator support" $(check_test "WITH_EMU") \475 WITH_SOFTCAM "Built-in SoftCam.Key" $(check_test "WITH_SOFTCAM") \476 468 2> ${tempfile} 477 469 -
trunk/oscam.c
r11503 r11504 428 428 } 429 429 write_conf(IPV6SUPPORT, "IPv6 support"); 430 write_conf(WITH_EMU, "Emulator support");431 write_conf(WITH_SOFTCAM, "Built-in SoftCam.Key");432 430 433 431 fprintf(fp, "\n");
Note:
See TracChangeset
for help on using the changeset viewer.