Browse Source

Attempt to suppress Xcode multi-group resource reference warnings.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
bffa727e2e
2 changed files with 12 additions and 4 deletions
  1. 1 0
      CMake/Modules/Urho3D-CMake-common.cmake
  2. 11 4
      Docs/GettingStarted.dox

+ 1 - 0
CMake/Modules/Urho3D-CMake-common.cmake

@@ -684,6 +684,7 @@ macro (setup_main_executable)
     # Define resource files
     if (XCODE)
         set (RESOURCE_FILES ${CMAKE_SOURCE_DIR}/Bin/CoreData ${CMAKE_SOURCE_DIR}/Bin/Data)
+        source_group (Resources FILES ${RESOURCE_FILES})
         set_source_files_properties (${RESOURCE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
         list (APPEND SOURCE_FILES ${RESOURCE_FILES})
     endif ()

+ 11 - 4
Docs/GettingStarted.dox

@@ -115,7 +115,7 @@ Urho3D uses CMake (http://www.cmake.org) to build. The process has two steps:
     - Mac OS X: cmake_macosx.sh or cmake_generic.sh\n
     - Linux: cmake_eclipse.sh, cmake_codeblocks.sh, or cmake_generic.sh\n
     - Raspberry Pi: cmake_rpi.sh, cmake_eclipse.sh, cmake_codeblocks.sh, or cmake_generic.sh\n
--# Use the IDE of your choice to open the CMake's generated project file or solution file in the build tree. Change the build configuration (Debug/Release) and then build all the targets.\n
+-# Use the IDE of your choice to open the CMake's generated project file or solution file in the build tree. Change the build configuration (Debug/Release) and change the built-in target to ALL_BUILD to build all the targets.\n
     - Visual Studio: open Urho3D.sln\n
     - Xcode: open Urho3D.xcodeproj\n
     - CodeBlocks: open Urho3D.cbp\n
@@ -172,7 +172,7 @@ You can also build and deploy using Eclipse IDE with ADT plugin. To do that, exe
 
 Run cmake_ios.sh. This generates an Xcode project named Urho3D.xcodeproj.
 
-Open the Xcode project and check the properties for the Urho3D project (topmost in the Project Navigator.) In Architectures -> Base SDK, choose your iOS SDK (CMake would automatically select latest iOS when generating the Xcode project). In Code Signing, enter your developer identity as necessary.
+Open the Xcode project and check the properties for the Urho3D project (topmost in the Project Navigator.) In Architectures -> Base SDK, choose your iOS SDK (CMake would automatically select latest iOS when generating the Xcode project). In Code Signing, enter your developer identity as necessary. Also ensure you have changed the built-in target to ALL_BUILD to build all the targets.
 
 The Urho3DPlayer target will actually build the application bundle and copy resources from Bin/Data and Bin/CoreData directories. Edit its build scheme to choose debug or release mode.
 
@@ -500,6 +500,8 @@ The Ruby and Rake are not prerequisite software components for building Urho3D a
 
 \verbatim
 rake cmake [fix_scm] [<generator>] [<platform>] [<option>=<value> [<option>=<value>]] [[<platform>_]build_tree=/path/to/build-tree]
+\endverbatim
+\verbatim
 rake make [numjobs=8] [<platform>] [<option>=<value> [<option>=<value>]] [[<platform>_]build_tree=/path/to/build-tree]
 \endverbatim
 
@@ -507,9 +509,14 @@ The default <generator> when not specified is 'generic', which let CMake to dete
 
 The default <platform> when not specified is 'native'. The possible values are: 'android', 'ios', 'mingw', 'rpi'. Naturally this influences the compiler toolchain being used in the generated build tree.
 
-When using the 'rake cmake' task, the <option>=\<value> pairs are optional build options supported by our build scripts as usual. However, the format here does not expect a leading '-D' for each pair. When using the 'rake make' task, the <option>=\<value> pairs are optional build options supported by the respective build tools. For example on iOS platform using 'xcodebuild' build tool, one could pass the '-sdk' option as follows: 'rake make ios sdk=iphonesimulator'. Note the absense of leading '-' character in the example. To build a specific built-in target in the project, use the 'target=built-in-target-name' option, e.g. 'rake make target=install'. In a multi-config project, such as Xcode project or VS solution, use the 'config=configuration-to-use' option to choose which build configuration to use, e.g. 'rake make vs2013 config=Release'.
+When using the 'rake cmake' task, the <option>=\<value> pairs are optional build options supported by our build scripts as usual. However, the format here does not expect a leading '-D' for each pair. When using the 'rake make' task, the <option>=\<value> pairs are optional build options supported by the respective build tools. For example on iOS platform using 'xcodebuild' build tool, one could pass the '-sdk' option as follows: 'rake make ios sdk=iphonesimulator'. Note the absense of leading '-' character in the example. To build a specific built-in target in the project, use the 'target' option, e.g. 'rake make target=install'. In a multi-config project, such as Xcode project or VS solution, use the 'config' option to choose which build configuration to use, e.g. 'rake make config=Release'.
+
+Use the 'build_tree' option to set the path to the desired build tree location. When not specified then the build tree location would be defaulted to '../<platform>-Build', relative to the project root. To avoid repeating the customized build tree locations for each platform, you can set and export them as environment variables. The '<platform_>build_tree' option takes precedence over normal 'build_tree' option. For example with these commands below, the RPI build tree will be generated in the ~/custom-rpi-Build and then build from there.
 
-Use the 'build_tree=/path/to/build-tree' option to set the path to the desired build tree location. When not specified then the build tree would be defaulted to '../<platform>-Build', relative to Urho3D or your project root. To avoid repeating the customized build tree locations for each platform, you can set and export them as environment variables, e.g.: export native_build_tree=~/custom-native-Build android_build_tree=~/custom-android-Build mingw_build_tree=~/custom-mingw-Build rpi_build_tree=~/custom-rpi-Build. The <platform_>build_tree option takes precedence over normal build_tree option.
+\verbatim
+export native_build_tree=~/custom-native-Build android_build_tree=~/custom-android-Build mingw_build_tree=~/custom-mingw-Build rpi_build_tree=~/custom-rpi-Build
+rake cmake rpi URHO3D_LUAJIT=1 URHO3D_LUAJIT_AMALG=1 && rake make rpi
+\endverbatim
 
 \page Structure Overall structure