diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ce624ff
--- /dev/null
+++ b/.gitignore
@@ -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/
diff --git a/.omnistudent_notes.txt.swp b/.omnistudent_notes.txt.swp
index e6c0cc7..930ca06 100644
Binary files a/.omnistudent_notes.txt.swp and b/.omnistudent_notes.txt.swp differ
diff --git a/minetest.xcodeproj/security.mode1v3 b/minetest.xcodeproj/security.mode1v3
index 69a6428..787c341 100644
--- a/minetest.xcodeproj/security.mode1v3
+++ b/minetest.xcodeproj/security.mode1v3
@@ -557,7 +557,7 @@
Frame
{{0, 0}, {1153, 264}}
RubberWindowFrame
- 42 185 1153 546 0 0 1280 778
+ 74 190 1153 546 0 0 1280 778
Module
PBXNavigatorGroup
@@ -565,8 +565,6 @@
264pt
- BecomeActive
-
ContentConfiguration
PBXProjectModuleGUID
@@ -583,7 +581,7 @@
Frame
{{0, 269}, {1153, 236}}
RubberWindowFrame
- 42 185 1153 546 0 0 1280 778
+ 74 190 1153 546 0 0 1280 778
Module
PBXBuildResultsModule
@@ -615,7 +613,7 @@
WindowContentMinSize
486 300
WindowString
- 42 185 1153 546 0 0 1280 778
+ 74 190 1153 546 0 0 1280 778
WindowToolGUID
957434F81843F3D300125813
WindowToolIsVisible
diff --git a/minetest.xcodeproj/security.pbxuser b/minetest.xcodeproj/security.pbxuser
index 7f2b167..6bc68ca 100644
--- a/minetest.xcodeproj/security.pbxuser
+++ b/minetest.xcodeproj/security.pbxuser
@@ -113,15 +113,6 @@
rLoc = 115;
rType = 1;
};
- 9574352A1844012900125813 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- name = "l_item.cpp: 116";
- rLen = 0;
- rLoc = 2792;
- rType = 0;
- vrLen = 399;
- vrLoc = 2590;
- };
9C1555C95EAD461792DDEF70 /* Project object */ = {
activeBuildConfigurationName = Release;
activeExecutable = 957434EE1843F3B700125813 /* minetest */;
@@ -180,9 +171,8 @@
PBXWorkspaceStateSaveDate = 407109974;
};
perUserProjectItems = {
- 957435111843F7DC00125813 = 957435111843F7DC00125813 /* PBXTextBookmark */;
- 957435121843F7DC00125813 = 957435121843F7DC00125813 /* PBXTextBookmark */;
- 9574352A1844012900125813 = 9574352A1844012900125813 /* PBXTextBookmark */;
+ 957435111843F7DC00125813 /* PBXTextBookmark */ = 957435111843F7DC00125813 /* PBXTextBookmark */;
+ 957435121843F7DC00125813 /* PBXTextBookmark */ = 957435121843F7DC00125813 /* PBXTextBookmark */;
};
sourceControlManager = 957434FA1843F3D300125813 /* Source Control */;
userBuildSettings = {
diff --git a/omnistudent_notes.txt b/omnistudent_notes.txt
index fcf991c..1eedd20 100644
--- a/omnistudent_notes.txt
+++ b/omnistudent_notes.txt
@@ -132,7 +132,7 @@ change get getTimeNs()
inline u32 getTimeNs()
{
- struct timespec ts;
+ // struct timespec ts;
//clock_gettime(CLOCK_REALTIME, &ts);
struct timeval tv;
gettimeofday(&tv, NULL);
@@ -146,3 +146,45 @@ set xcode configuration to release
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/
diff --git a/src/.game.h.swp b/src/.game.h.swp
new file mode 100644
index 0000000..c54a288
Binary files /dev/null and b/src/.game.h.swp differ
diff --git a/src/.main.cpp.swp b/src/.main.cpp.swp
new file mode 100644
index 0000000..3a25270
Binary files /dev/null and b/src/.main.cpp.swp differ