13 added gitignore
parent
5d553adb3c
commit
1b46638d1c
|
@ -0,0 +1,7 @@
|
||||||
|
minetest-0.4.8-dev-osx.dmg
|
||||||
|
.DS_Store
|
||||||
|
*.pbxuser
|
||||||
|
*.mode1v3
|
||||||
|
minetest-mac.xcodeproj/xcuserdata/*
|
||||||
|
minetest-mac.xcodeproj/project.xcworkspace/xcuserdata/*
|
||||||
|
build/
|
Binary file not shown.
|
@ -557,7 +557,7 @@
|
||||||
<key>Frame</key>
|
<key>Frame</key>
|
||||||
<string>{{0, 0}, {1153, 264}}</string>
|
<string>{{0, 0}, {1153, 264}}</string>
|
||||||
<key>RubberWindowFrame</key>
|
<key>RubberWindowFrame</key>
|
||||||
<string>42 185 1153 546 0 0 1280 778 </string>
|
<string>74 190 1153 546 0 0 1280 778 </string>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Module</key>
|
<key>Module</key>
|
||||||
<string>PBXNavigatorGroup</string>
|
<string>PBXNavigatorGroup</string>
|
||||||
|
@ -565,8 +565,6 @@
|
||||||
<string>264pt</string>
|
<string>264pt</string>
|
||||||
</dict>
|
</dict>
|
||||||
<dict>
|
<dict>
|
||||||
<key>BecomeActive</key>
|
|
||||||
<true/>
|
|
||||||
<key>ContentConfiguration</key>
|
<key>ContentConfiguration</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>PBXProjectModuleGUID</key>
|
<key>PBXProjectModuleGUID</key>
|
||||||
|
@ -583,7 +581,7 @@
|
||||||
<key>Frame</key>
|
<key>Frame</key>
|
||||||
<string>{{0, 269}, {1153, 236}}</string>
|
<string>{{0, 269}, {1153, 236}}</string>
|
||||||
<key>RubberWindowFrame</key>
|
<key>RubberWindowFrame</key>
|
||||||
<string>42 185 1153 546 0 0 1280 778 </string>
|
<string>74 190 1153 546 0 0 1280 778 </string>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Module</key>
|
<key>Module</key>
|
||||||
<string>PBXBuildResultsModule</string>
|
<string>PBXBuildResultsModule</string>
|
||||||
|
@ -615,7 +613,7 @@
|
||||||
<key>WindowContentMinSize</key>
|
<key>WindowContentMinSize</key>
|
||||||
<string>486 300</string>
|
<string>486 300</string>
|
||||||
<key>WindowString</key>
|
<key>WindowString</key>
|
||||||
<string>42 185 1153 546 0 0 1280 778 </string>
|
<string>74 190 1153 546 0 0 1280 778 </string>
|
||||||
<key>WindowToolGUID</key>
|
<key>WindowToolGUID</key>
|
||||||
<string>957434F81843F3D300125813</string>
|
<string>957434F81843F3D300125813</string>
|
||||||
<key>WindowToolIsVisible</key>
|
<key>WindowToolIsVisible</key>
|
||||||
|
|
|
@ -113,15 +113,6 @@
|
||||||
rLoc = 115;
|
rLoc = 115;
|
||||||
rType = 1;
|
rType = 1;
|
||||||
};
|
};
|
||||||
9574352A1844012900125813 /* PBXTextBookmark */ = {
|
|
||||||
isa = PBXTextBookmark;
|
|
||||||
name = "l_item.cpp: 116";
|
|
||||||
rLen = 0;
|
|
||||||
rLoc = 2792;
|
|
||||||
rType = 0;
|
|
||||||
vrLen = 399;
|
|
||||||
vrLoc = 2590;
|
|
||||||
};
|
|
||||||
9C1555C95EAD461792DDEF70 /* Project object */ = {
|
9C1555C95EAD461792DDEF70 /* Project object */ = {
|
||||||
activeBuildConfigurationName = Release;
|
activeBuildConfigurationName = Release;
|
||||||
activeExecutable = 957434EE1843F3B700125813 /* minetest */;
|
activeExecutable = 957434EE1843F3B700125813 /* minetest */;
|
||||||
|
@ -180,9 +171,8 @@
|
||||||
PBXWorkspaceStateSaveDate = 407109974;
|
PBXWorkspaceStateSaveDate = 407109974;
|
||||||
};
|
};
|
||||||
perUserProjectItems = {
|
perUserProjectItems = {
|
||||||
957435111843F7DC00125813 = 957435111843F7DC00125813 /* PBXTextBookmark */;
|
957435111843F7DC00125813 /* PBXTextBookmark */ = 957435111843F7DC00125813 /* PBXTextBookmark */;
|
||||||
957435121843F7DC00125813 = 957435121843F7DC00125813 /* PBXTextBookmark */;
|
957435121843F7DC00125813 /* PBXTextBookmark */ = 957435121843F7DC00125813 /* PBXTextBookmark */;
|
||||||
9574352A1844012900125813 = 9574352A1844012900125813 /* PBXTextBookmark */;
|
|
||||||
};
|
};
|
||||||
sourceControlManager = 957434FA1843F3D300125813 /* Source Control */;
|
sourceControlManager = 957434FA1843F3D300125813 /* Source Control */;
|
||||||
userBuildSettings = {
|
userBuildSettings = {
|
||||||
|
|
|
@ -132,7 +132,7 @@ change get getTimeNs()
|
||||||
|
|
||||||
inline u32 getTimeNs()
|
inline u32 getTimeNs()
|
||||||
{
|
{
|
||||||
struct timespec ts;
|
// struct timespec ts;
|
||||||
//clock_gettime(CLOCK_REALTIME, &ts);
|
//clock_gettime(CLOCK_REALTIME, &ts);
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
gettimeofday(&tv, NULL);
|
gettimeofday(&tv, NULL);
|
||||||
|
@ -146,3 +146,45 @@ set xcode configuration to release
|
||||||
|
|
||||||
copied mac files from osxminecraft/misc/mac to same dir
|
copied mac files from osxminecraft/misc/mac to same dir
|
||||||
|
|
||||||
|
|
||||||
|
Build now works with package and release selections in xcode
|
||||||
|
|
||||||
|
|
||||||
|
Found in mrscotty cmakelists.txt
|
||||||
|
|
||||||
|
|
||||||
|
if(APPLE)
|
||||||
|
# TODO: install Irrlicht.framework into app bundle!
|
||||||
|
# it should be in Contents/Resources/Frameworks/Irrlicht.framework
|
||||||
|
|
||||||
|
# Compile .xib files
|
||||||
|
# should be in Contents/Resources/MainMenu.nib at the end
|
||||||
|
set (MinetestMac_XIBS
|
||||||
|
MainMenu
|
||||||
|
)
|
||||||
|
# Make sure the 'Resources' Directory is correctly created before we build
|
||||||
|
add_custom_command (TARGET ${PROJECT_NAME} PRE_BUILD
|
||||||
|
COMMAND mkdir -p ${EXECUTABLE_OUTPUT_PATH}/\${CONFIGURATION}/Contents/Resources)
|
||||||
|
find_program(IBTOOL ibtool HINTS "/usr/bin" "${OSX_DEVELOPER_ROOT}/usr/bin")
|
||||||
|
if (${IBTOOL} STREQUAL "IBTOOL-NOTFOUND")
|
||||||
|
message(SEND_ERROR "ibtool can not be found and is needed to compile the .xib files. It should have been installed with
|
||||||
|
the Apple developer tools. The default system paths were searched in addition to ${OSX_DEVELOPER_ROOT}/usr/bin") endif()
|
||||||
|
# Compile the .xib files using the 'ibtool' program with the destination being the app package
|
||||||
|
foreach(xib ${MinetestMac_XIBS})
|
||||||
|
add_custom_command (TARGET ${PROJECT_NAME} POST_BUILD
|
||||||
|
COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text
|
||||||
|
--compile ${EXECUTABLE_OUTPUT_PATH}/\${CONFIGURATION}/Contents/Resources/${xib}.nib
|
||||||
|
${CMAKE_SOURCE_DIR}/misc/mac/${xib}.xib
|
||||||
|
COMMENT "Compiling ${CMAKE_SOURCE_DIR}/${xib}.xib")
|
||||||
|
endforeach()
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
|
for gitignore
|
||||||
|
minetest-0.4.8-dev-osx.dmg
|
||||||
|
.DS_Store
|
||||||
|
*.pbxuser
|
||||||
|
*.mode1v3
|
||||||
|
minetest-mac.xcodeproj/xcuserdata/*
|
||||||
|
minetest-mac.xcodeproj/project.xcworkspace/xcuserdata/*
|
||||||
|
build/
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue