From 1b46638d1c086263c431630ebfb27227ba53bb6d Mon Sep 17 00:00:00 2001 From: Omnistudent Date: Tue, 26 Nov 2013 11:16:35 +0100 Subject: [PATCH] 13 added gitignore --- .gitignore | 7 +++++ .omnistudent_notes.txt.swp | Bin 12288 -> 16384 bytes minetest.xcodeproj/security.mode1v3 | 8 ++--- minetest.xcodeproj/security.pbxuser | 14 ++------- omnistudent_notes.txt | 44 +++++++++++++++++++++++++++- src/.game.h.swp | Bin 0 -> 12288 bytes src/.main.cpp.swp | Bin 0 -> 16384 bytes 7 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 .gitignore create mode 100644 src/.game.h.swp create mode 100644 src/.main.cpp.swp 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 e6c0cc79635a536f6c3cb6aa484c67e4d35bbc13..930ca064f37c65c09004bb5c76ed88ba20da3c15 100644 GIT binary patch delta 2052 zcmb7_&u<$=6vwBbhnoIKB1-rr#NbqlQ^~tUMNk13$KJGt*z2y>RS#6#_3k(xvOlby z*~C$0Z4ZFBLMfF{RY2T00l9IYDnG9ZcszIpTJz3VGyl>t6{ELNqv$HcK!`zH|fb06T`MJmD9~%E5%ah+5 zJ5S90F#8@oc=R}C-c-hLa(!o>J~Oj&7uH{a8z2Jbz?0y2nEeWV0e8V|@HKcFyakk- z@$b8z9N&4Tce7fotFrcpN+m z{x}9Z@EN!TJ_HT00B#>8Bml2~J4Xn40sMHFkT1ay(8J_q^4-IPd;l(k^PmOJf>m$^ zJPjTJ1@I?={0V#tZWeY99Q^)J#v-4Sg1Yxg2)>|(y*Od6*Do!1Qy%y_33@L*-@5y4GICN2;qbZ5(-;l9L$#b} zwYJlih+@yhDeZafOxb6flCE>f*CS=P?-_8Us@Z55O`8_0aX8=skJjml zE7eBjHN(l;X2+@;POWZ@^b=QxygSlxD=uRh#Wl6N-z?<9(~*k%>?hWRa@otbU|48e zG^!oDva)74X2))IY^PPR&yDog;nQrc*3WjVik;QX=18x`kz|n+y2V7CCLR-0-x2Rp zIM0tzY1ZJjzG9o^+K86REJ@--V6f#T5e}t>Q7k!@V-%-ykjgT$6uOf3)6k8|D68*w z16G!7D09CMuxmoEEiU`{ zBOi+6kt=x|(Jq@Va0delrER$DjHm(?3d&7oFbEihI#>`7SVEOcp-~%;eAaW*KvJ|&HwdsWPZlz*GQoSav?q_YZ5ih~l{H!%3#QyO?NzhWtnEs> z$0Og#CTTB?t>`4+bM>a(rp4Ve)8c>RWDo2m7>vQqliW zsAY@=ie-zm;clSFDJrd!y0qI{OSHxlytv|In`Wqj7bog(uuVNQh(ubuOsN|xq4^sS z-c%rkhRdS{i&BgQleF}A(dWBPs)bTRRsYb~Qzx2gZ8wv7a8Oacc-k*}y@Kid3E$Ph zzMfanJ}iF~>-8iFxYw6jZ#tJdvCW$K(o{ZF8D$Sz;Tg23daMhX2JBfgTf>Q7G7zfU^_?_sB6k*K?Qjx(R 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 0000000000000000000000000000000000000000..c54a28898a9a16cbf73e60ab7743b19c9821d629 GIT binary patch literal 12288 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 X4-;)G@O_G&V