Skip to content

Commit e87151f

Browse files
cycoChristoph Leimbrock
authored andcommitted
Fix some warning and adjust project settings.
1 parent fa98f8a commit e87151f

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

4DO.xcodeproj/project.pbxproj

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@
374374
isa = PBXProject;
375375
attributes = {
376376
BuildIndependentTargetsInParallel = YES;
377-
LastUpgradeCheck = 0430;
377+
LastUpgradeCheck = 0700;
378378
};
379379
buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "4DO" */;
380380
compatibilityVersion = "Xcode 3.2";
@@ -509,6 +509,7 @@
509509
isa = XCBuildConfiguration;
510510
buildSettings = {
511511
CLANG_ENABLE_OBJC_ARC = YES;
512+
COMBINE_HIDPI_IMAGES = YES;
512513
GCC_WARN_UNUSED_VARIABLE = NO;
513514
HEADER_SEARCH_PATHS = (
514515
"\"$(PROJECT_DIR)/core/lib/\"",
@@ -532,6 +533,7 @@
532533
"$(OTHER_CFLAGS)",
533534
"-g",
534535
);
536+
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:identifier}";
535537
PRODUCT_NAME = 4DO;
536538
USER_HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/core/\" \"$(PROJECT_DIR)/libcue/\"/** \"$(PROJECT_DIR)/libfreedo/\"";
537539
WRAPPER_EXTENSION = oecoreplugin;
@@ -542,6 +544,7 @@
542544
isa = XCBuildConfiguration;
543545
buildSettings = {
544546
CLANG_ENABLE_OBJC_ARC = YES;
547+
COMBINE_HIDPI_IMAGES = YES;
545548
GCC_WARN_UNUSED_VARIABLE = NO;
546549
HEADER_SEARCH_PATHS = (
547550
"\"$(PROJECT_DIR)/core/lib/\"",
@@ -565,6 +568,7 @@
565568
"$(OTHER_CFLAGS)",
566569
"-g",
567570
);
571+
PRODUCT_BUNDLE_IDENTIFIER = "org.openemu.${PRODUCT_NAME:identifier}";
568572
PRODUCT_NAME = 4DO;
569573
USER_HEADER_SEARCH_PATHS = "\"$(PROJECT_DIR)/core/\" \"$(PROJECT_DIR)/libcue/\"/** \"$(PROJECT_DIR)/libfreedo/\"";
570574
WRAPPER_EXTENSION = oecoreplugin;
@@ -575,18 +579,32 @@
575579
isa = XCBuildConfiguration;
576580
buildSettings = {
577581
ALWAYS_SEARCH_USER_PATHS = NO;
578-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
579582
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
583+
CLANG_WARN_BOOL_CONVERSION = YES;
584+
CLANG_WARN_CONSTANT_CONVERSION = YES;
585+
CLANG_WARN_EMPTY_BODY = YES;
586+
CLANG_WARN_ENUM_CONVERSION = YES;
587+
CLANG_WARN_INT_CONVERSION = YES;
588+
CLANG_WARN_UNREACHABLE_CODE = YES;
589+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
580590
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
591+
ENABLE_STRICT_OBJC_MSGSEND = YES;
592+
ENABLE_TESTABILITY = YES;
581593
GCC_C_LANGUAGE_STANDARD = c99;
582594
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
595+
GCC_NO_COMMON_BLOCKS = YES;
583596
GCC_OPTIMIZATION_LEVEL = 0;
584597
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
585598
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
599+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
586600
GCC_WARN_ABOUT_RETURN_TYPE = YES;
601+
GCC_WARN_UNDECLARED_SELECTOR = YES;
602+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
603+
GCC_WARN_UNUSED_FUNCTION = YES;
587604
GCC_WARN_UNUSED_VARIABLE = YES;
588605
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
589606
MACOSX_DEPLOYMENT_TARGET = 10.7;
607+
ONLY_ACTIVE_ARCH = YES;
590608
SDKROOT = macosx;
591609
SKIP_INSTALL = YES;
592610
VALID_ARCHS = x86_64;
@@ -597,16 +615,28 @@
597615
isa = XCBuildConfiguration;
598616
buildSettings = {
599617
ALWAYS_SEARCH_USER_PATHS = NO;
600-
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
601618
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
619+
CLANG_WARN_BOOL_CONVERSION = YES;
620+
CLANG_WARN_CONSTANT_CONVERSION = YES;
621+
CLANG_WARN_EMPTY_BODY = YES;
622+
CLANG_WARN_ENUM_CONVERSION = YES;
623+
CLANG_WARN_INT_CONVERSION = YES;
624+
CLANG_WARN_UNREACHABLE_CODE = YES;
625+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
602626
DEAD_CODE_STRIPPING = YES;
603627
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
628+
ENABLE_STRICT_OBJC_MSGSEND = YES;
604629
GCC_C_LANGUAGE_STANDARD = c99;
605630
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = YES;
631+
GCC_NO_COMMON_BLOCKS = YES;
606632
GCC_OPTIMIZATION_LEVEL = 3;
607633
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
608634
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
635+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
609636
GCC_WARN_ABOUT_RETURN_TYPE = YES;
637+
GCC_WARN_UNDECLARED_SELECTOR = YES;
638+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
639+
GCC_WARN_UNUSED_FUNCTION = YES;
610640
GCC_WARN_UNUSED_VARIABLE = YES;
611641
INSTALL_PATH = "\"$(USER_LIBRARY_DIR)/Application Support/OpenEmu/Cores\"";
612642
MACOSX_DEPLOYMENT_TARGET = 10.7;
@@ -619,6 +649,7 @@
619649
575ACC291582D4F000EAC45A /* Debug */ = {
620650
isa = XCBuildConfiguration;
621651
buildSettings = {
652+
COMBINE_HIDPI_IMAGES = YES;
622653
COPY_PHASE_STRIP = NO;
623654
EXECUTABLE_PREFIX = lib;
624655
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -640,6 +671,7 @@
640671
575ACC2A1582D4F000EAC45A /* Release */ = {
641672
isa = XCBuildConfiguration;
642673
buildSettings = {
674+
COMBINE_HIDPI_IMAGES = YES;
643675
COPY_PHASE_STRIP = YES;
644676
EXECUTABLE_PREFIX = lib;
645677
GCC_C_LANGUAGE_STANDARD = gnu99;

Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<key>CFBundleIconFile</key>
1010
<string></string>
1111
<key>CFBundleIdentifier</key>
12-
<string>org.openemu.${PRODUCT_NAME:identifier}</string>
12+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1313
<key>CFBundleInfoDictionaryVersion</key>
1414
<string>6.0</string>
1515
<key>CFBundleName</key>

0 commit comments

Comments
 (0)