From e852d656c289139c88721a57d423c685d6fd29ad Mon Sep 17 00:00:00 2001 From: Omnistudent Date: Mon, 25 Nov 2013 09:31:03 +0100 Subject: [PATCH] Fifth REAL commit, commented out line 171 in in src/cmakelists.txt --- .CMakeLists.txt.swp | Bin 0 -> 20480 bytes .omnistudent_notes.txt.swp | Bin 12288 -> 12288 bytes omnistudent_notes.txt | 88 +++++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 .CMakeLists.txt.swp diff --git a/.CMakeLists.txt.swp b/.CMakeLists.txt.swp new file mode 100644 index 0000000000000000000000000000000000000000..766c33db83c8621347b7d5481b71e3f37f39fd00 GIT binary patch literal 20480 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 K1dsY$BmEDz_cqc1 literal 0 HcmV?d00001 diff --git a/.omnistudent_notes.txt.swp b/.omnistudent_notes.txt.swp index 8eb643eeac122740410c9f77b629d499126b6039..b414ce0a2943c1c5526873ef847733874dd6a167 100644 GIT binary patch literal 12288 zcmeI2Uu+{s9ml8qH|;?wqMW#broK~gO6*N8Cjv>ip5xf5Isb_q2d)yx%A{8HFy?$AAA9n!ArLj@*?;)xCtHukAjE6N5E-t z7kKsEguDX&0&amP!4u#HxDK|!Y4B2tkY9pl!7sq$;G5tp;1O^MJP0m=6>ul`>$?c~ z75Fju9{3jc2KX9S1RnEVvtd0KD>6LjDDw13v*zfIj#%xCgw5_;~?551s=*15r%9(R)I1 zO|RL);nWsE+wFvsX;%bP3o5zCnc^5h>X4*TlIu{SVvy5=7OtYu`|0x1=tDm?tO!wa zzbRiQbn0VSXweEx$4^bP9a@>+da^OTuhSWulyhFI;Xliup>jTrDor`?P|oRBEEL>SF?0q4a>H z+`w}KPQ#V+W*|-2uBprdA$FGq9d62|%g;KzZ92q$s`XmES+A7~bcsyYj7DH8+`#s5 z!G}KJGrMc)uH?*V^@Zo!`?>DL*?QBcvjp>7J0i zxps|s#x8NOj1u>ZQb(g3)lC$sePxY`&vH+3<9S;s_Znes%_TL4;9F`p=;XSQSyyg?mjp=Wx~2qMxRl#hqrkmT#8pHJUzmaAk9=mEYdpX>FDphiN0e z@O|8eq9W9>2ir{2!#%0t?I?tNX1kJamg{_Q}6R&3$r^vJy1x=1IKM=Fq2Ag0U?*#DK<0l zSc+GQ7)@`5zB*T(Lf;T@LyA?L z(_lPGT43_32uzcs^^1ZAC36>bj^ak}ImNGeA)*0BKmM=UzA-vY$V8Ozaq>jzQc;eJ zkoy!l!5m7CE4i(Obh%oL(v&%pJlv3^p4;OT;c($Xlt7fUt=TP(L{pN&k1V>#G|}D2 zMI<<+J^b10GEK`g;M_4*9kGT(4rc@`6{<)Ul~J--TV7qEnaLfzKnh4vbVp-D(~K{a z#yM%5e1j{S9&Ni)>4h~I+YNew*b8W65QnSpv%sNg8~IyvoS#f0Q}>zfs&tOTjfzqV zNino&I#yLUp~sa~LIN4*ja*c>cHsie%rOPe#JEA?qYzS=bV}oN+HnUwfDn`U^WIs< z$7a7wGea{lz1MZ^E^RZ{gKiA@KN<_o4rq3ZUWr~JazuCG2Juf_O*$^-;+b=%t94(k zSr$sV;nf`EuF8!F(O7uLtUJyIYVG2@Q5IeSq6@XAIW^OCgsH_FGyL>J z)ujlR4&ujW3g=5)Zj?uL)~D$mj&~e~n$tB}5LY9z#K8C&o-*0ECzcVy)36_%k%+`} z_+$mmf)6g6>qJ7MY86s@3aV+mIQU@sP!ZPN@VK7{y^+wa4)5}~wtBv1#3K|GnG8O*&iOeZE7eU0A+VO{bZ3$?JN*T&N0 z6gL7mu3}d`j;)BbwY%Il%e07n8?Q7L8lh+Rpsj3sVlP_nFNQeA@oK58_JQ3;7s+q&=h>Zov4S!BFX_!u4y7{KOq z*`yITn~4j{_)+8p>&Ej5J*GWPIx#zC9P}f1lVgtOGaa8%nS<=&3Fe#}|1-gZ?PJ0} z-Vg{JlXXql%ngYD5--H;1#ES^)D5#YGS3Oy&=gDV<9a$Zy@q@AHD-hydJh9~ypN+K iJDvw@{;#tzc`8Ioo2x+N)x1iZcsp969@4?lK28Il#$w66-8^wO{Giq)Y6!^@~dz6cTp_LmVt2tRv VVfAKamQ!4ldG*CN&(%(50RU=F5s?4@ diff --git a/omnistudent_notes.txt b/omnistudent_notes.txt index 862c4d1..f91f03b 100644 --- a/omnistudent_notes.txt +++ b/omnistudent_notes.txt @@ -56,3 +56,91 @@ CMake Error at cmake/Modules/FindOpenGLES2.cmake:44 (create_search_paths): Call Stack (most recent call first): src/CMakeLists.txt:173 (find_package) + +// From earlier notes, this is what I need to do: + +in src/cmakelists.txt + +some changes early in set directories, make to look like van44 + + + if(APPLE) + FIND_LIBRARY(CARBON_LIB Carbon) + FIND_LIBRARY(COCOA_LIB Cocoa) + FIND_LIBRARY(IOKIT_LIB IOKit) + mark_as_advanced( + CARBON_LIB + COCOA_LIB + IOKIT_LIB + ) + SET(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${CARBON_LIB} ${COCOA_LIB} ${IOKIT_LIB}) + endif(APPLE) + + +to + + if(APPLE) + FIND_LIBRARY(CARBON_LIB Carbon) + FIND_LIBRARY(COCOA_LIB Cocoa) + FIND_LIBRARY(IOKIT_LIB IOKit) + FIND_LIBRARY(COREFOUNDATION_LIB CoreFoundation ) + mark_as_advanced( + CARBON_LIB + COCOA_LIB + IOKIT_LIB + COREFOUNDATION_LIB + ) + SET(CLIENT_PLATFORM_LIBS ${CLIENT_PLATFORM_LIBS} ${CARBON_LIB} ${COCOA_LIB} ${IOKIT_LIB} ${COREFOUNDATION_LIB}) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") + endif(APPLE) + +comment out + +find_package(OpenGLES2) + +change + +set(PLATFORM_LIBS -lpthread -lrt ${CMAKE_DL_LIBS}) + +to + +set(PLATFORM_LIBS -lpthread ${CMAKE_DL_LIBS}) + +in cmakelists.txt + +comment out + +install(FILES "misc/minetest.desktop" DESTINATION "${XDG_APPS_DIR}") + +in porting.h + +after +#else // Posix + #include + #include + +insert + +#include +#include // This one makes policy thread work +#include +#include +#define CLOCK_REALTIME 0 +#define CLOCK_MONOTONIC 0 + +change get getTimeNs() + + inline u32 getTimeNs() + { + struct timespec ts; + //clock_gettime(CLOCK_REALTIME, &ts); + struct timeval tv; + gettimeofday(&tv, NULL); + // tv_sec = tv.tv_sec; + // tv_nsec = tv.tv_usec * 1000; + return tv.tv_sec * 1000000000 + tv.tv_usec*1000; + } + + +set xcode configuration to release +