Changeset 40
- Timestamp:
- 08/11/05 11:26:47 (3 years ago)
- Location:
- NEWT0/trunk
- Files:
-
- 1 added
- 12 modified
-
Makefile.in (modified) (1 diff)
-
configure (modified) (8 diffs)
-
configure.in (modified) (6 diffs)
-
configure_ipod (added)
-
ext.xcode/gnue.mode1 (modified) (2 diffs)
-
ext.xcode/gnue.pbxuser (modified) (2 diffs)
-
newt.xcode/gnue.mode1 (modified) (24 diffs)
-
newt.xcode/gnue.pbxuser (modified) (32 diffs)
-
src/config.h.in (modified) (1 diff)
-
src/newt_core/NewtFile.c (modified) (9 diffs)
-
src/newt_core/NewtVM.c (modified) (1 diff)
-
src/newt_core/incs/darwin/config.h (modified) (2 diffs)
-
src/version.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
NEWT0/trunk/Makefile.in
r37 r40 69 69 ### all 70 70 71 all: newt ext71 all: newt @MAKE_EXT@ 72 72 73 73 -
NEWT0/trunk/configure
r36 r40 312 312 #endif" 313 313 314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT YACC LEX LEXLIB LEX_OUTPUT_ROOT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CPP EGREP LIBOBJS LIBREGEX NEWT_LDIMPORT NEWT_LDFLAGS LIBNEWT_LDSHARED LINK_NEWT_APP_ DLEXT LTLIBOBJS'314 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT YACC LEX LEXLIB LEX_OUTPUT_ROOT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CPP EGREP LIBOBJS LIBREGEX NEWT_LDIMPORT NEWT_LDFLAGS LIBNEWT_LDSHARED LINK_NEWT_APP_ DLEXT MAKE_EXT LTLIBOBJS' 315 315 ac_subst_files='' 316 316 … … 2737 2737 conftest$ac_exeext conftest.$ac_ext 2738 2738 2739 cat >conftest.$ac_ext <<_ACEOF 2740 /* confdefs.h. */ 2741 _ACEOF 2742 cat confdefs.h >>conftest.$ac_ext 2743 cat >>conftest.$ac_ext <<_ACEOF 2744 /* end confdefs.h. */ 2745 2746 #include <dlfcn.h> 2747 2748 int 2749 main () 2750 { 2751 2752 void * install_call; 2753 void * lib; 2754 2755 lib = dlopen("", RTLD_LAZY); 2756 install_call = dlsym(lib, ""); 2757 dlclose(lib); 2758 2759 ; 2760 return 0; 2761 } 2762 _ACEOF 2763 rm -f conftest.$ac_objext conftest$ac_exeext 2764 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 2765 (eval $ac_link) 2>conftest.er1 2766 ac_status=$? 2767 grep -v '^ *+' conftest.er1 >conftest.err 2768 rm -f conftest.er1 2769 cat conftest.err >&5 2770 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2771 (exit $ac_status); } && 2772 { ac_try='test -z "$ac_c_werror_flag" 2773 || test ! -s conftest.err' 2774 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2775 (eval $ac_try) 2>&5 2776 ac_status=$? 2777 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2778 (exit $ac_status); }; } && 2779 { ac_try='test -s conftest$ac_exeext' 2780 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2781 (eval $ac_try) 2>&5 2782 ac_status=$? 2783 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2784 (exit $ac_status); }; }; then 2785 HAVE_DLOPEN='yes' 2786 else 2787 echo "$as_me: failed program was:" >&5 2788 sed 's/^/| /' conftest.$ac_ext >&5 2789 2790 SAVE_LIBS="$LIBS" 2791 LIBS="$LIBS -ldl" 2792 cat >conftest.$ac_ext <<_ACEOF 2793 /* confdefs.h. */ 2794 _ACEOF 2795 cat confdefs.h >>conftest.$ac_ext 2796 cat >>conftest.$ac_ext <<_ACEOF 2797 /* end confdefs.h. */ 2798 2799 #include <dlfcn.h> 2800 2801 int 2802 main () 2803 { 2804 2805 void * install_call; 2806 void * lib; 2807 2808 lib = dlopen("", RTLD_LAZY); 2809 install_call = dlsym(lib, ""); 2810 dlclose(lib); 2811 2812 ; 2813 return 0; 2814 } 2815 _ACEOF 2816 rm -f conftest.$ac_objext conftest$ac_exeext 2817 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 2818 (eval $ac_link) 2>conftest.er1 2819 ac_status=$? 2820 grep -v '^ *+' conftest.er1 >conftest.err 2821 rm -f conftest.er1 2822 cat conftest.err >&5 2823 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2824 (exit $ac_status); } && 2825 { ac_try='test -z "$ac_c_werror_flag" 2826 || test ! -s conftest.err' 2827 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2828 (eval $ac_try) 2>&5 2829 ac_status=$? 2830 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2831 (exit $ac_status); }; } && 2832 { ac_try='test -s conftest$ac_exeext' 2833 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 2834 (eval $ac_try) 2>&5 2835 ac_status=$? 2836 echo "$as_me:$LINENO: \$? = $ac_status" >&5 2837 (exit $ac_status); }; }; then 2838 HAVE_DLOPEN='yes' 2839 LIBDL=" -ldl" 2840 else 2841 echo "$as_me: failed program was:" >&5 2842 sed 's/^/| /' conftest.$ac_ext >&5 2843 2844 fi 2845 rm -f conftest.err conftest.$ac_objext \ 2846 conftest$ac_exeext conftest.$ac_ext 2847 LIBS="$SAVE_LIBS" 2848 fi 2849 rm -f conftest.err conftest.$ac_objext \ 2850 conftest$ac_exeext conftest.$ac_ext 2851 2852 2739 2853 # Checks for header files. 2740 2854 ac_ext=c … … 4585 4699 _ACEOF 4586 4700 4701 HAVE_DLOPEN='yes' 4587 4702 NEWT_LDIMPORT='$(build)/libnewt.a' 4588 4703 NEWT_LDFLAGS='-Wl,--export-all-symbols,--out-implib=$(LDIMPORT)' … … 4592 4707 ;; 4593 4708 linux*) 4594 NEWT_LDFLAGS='-ldl -rdynamic' 4709 # NEWT_LDFLAGS='-ldl -rdynamic' 4710 NEWT_LDFLAGS='-rdynamic' 4595 4711 LIBNEWT_LDSHARED='$(CC) -shared' 4596 4712 DLEXT='so' … … 4602 4718 ;; 4603 4719 beos*) 4604 NEWT_LDFLAGS='-ldl'4720 # NEWT_LDFLAGS='-ldl' 4605 4721 LIBNEWT_LDSHARED='$(CC) -nostart $(build)/_APP_' 4606 4722 LINK_NEWT_APP_='cd $@; ln -s newt _APP_' … … 4615 4731 4616 4732 4733 case "$target_vendor" in 4734 *ipod*) 4735 cat >>confdefs.h <<\_ACEOF 4736 #define __IPOD__ 1 4737 _ACEOF 4738 4739 NEWT_LDFLAGS= 4740 ;; 4741 esac 4742 4743 4744 case "$HAVE_DLOPEN" in 4745 yes) 4746 cat >>confdefs.h <<\_ACEOF 4747 #define HAVE_DLOPEN 1 4748 _ACEOF 4749 4750 MAKE_EXT='ext' 4751 ;; 4752 esac 4753 4754 4755 NEWT_LDFLAGS="$NEWT_LDFLAGS $LIBDL" 4756 4617 4757 cat >>confdefs.h <<_ACEOF 4618 4758 #define __PLATFORM__ "$target_os" … … 4622 4762 #define __DYLIBSUFFIX__ ".$DLEXT" 4623 4763 _ACEOF 4764 4765 4624 4766 4625 4767 … … 5278 5420 s,@LINK_NEWT_APP_@,$LINK_NEWT_APP_,;t t 5279 5421 s,@DLEXT@,$DLEXT,;t t 5422 s,@MAKE_EXT@,$MAKE_EXT,;t t 5280 5423 s,@LTLIBOBJS@,$LTLIBOBJS,;t t 5281 5424 CEOF -
NEWT0/trunk/configure.in
r36 r40 40 40 LIBS="$SAVE_LIBS") 41 41 42 AC_TRY_LINK([ 43 #include <dlfcn.h> 44 ], [ 45 void * install_call; 46 void * lib; 47 48 lib = dlopen("", RTLD_LAZY); 49 install_call = dlsym(lib, ""); 50 dlclose(lib); 51 ], 52 HAVE_DLOPEN='yes', 53 54 SAVE_LIBS="$LIBS" 55 LIBS="$LIBS -ldl" 56 AC_TRY_LINK([ 57 #include <dlfcn.h> 58 ], [ 59 void * install_call; 60 void * lib; 61 62 lib = dlopen("", RTLD_LAZY); 63 install_call = dlsym(lib, ""); 64 dlclose(lib); 65 ], 66 HAVE_DLOPEN='yes' 67 LIBDL=" -ldl") 68 LIBS="$SAVE_LIBS") 69 70 42 71 # Checks for header files. 43 72 AC_HEADER_STDC … … 67 96 cygwin*|mingw*) 68 97 AC_DEFINE(__WIN32__) 98 HAVE_DLOPEN='yes' 69 99 NEWT_LDIMPORT='$(build)/libnewt.a' 70 100 NEWT_LDFLAGS='-Wl,--export-all-symbols,--out-implib=$(LDIMPORT)' … … 74 104 ;; 75 105 linux*) 76 NEWT_LDFLAGS='-ldl -rdynamic' 106 # NEWT_LDFLAGS='-ldl -rdynamic' 107 NEWT_LDFLAGS='-rdynamic' 77 108 LIBNEWT_LDSHARED='$(CC) -shared' 78 109 DLEXT='so' … … 84 115 ;; 85 116 beos*) 86 NEWT_LDFLAGS='-ldl'117 # NEWT_LDFLAGS='-ldl' 87 118 LIBNEWT_LDSHARED='$(CC) -nostart $(build)/_APP_' 88 119 LINK_NEWT_APP_='cd $@; ln -s newt _APP_' … … 97 128 98 129 130 case "$target_vendor" in 131 *ipod*) 132 AC_DEFINE(__IPOD__) 133 NEWT_LDFLAGS= 134 ;; 135 esac 136 137 138 case "$HAVE_DLOPEN" in 139 yes) 140 AC_DEFINE(HAVE_DLOPEN) 141 MAKE_EXT='ext' 142 ;; 143 esac 144 145 146 NEWT_LDFLAGS="$NEWT_LDFLAGS $LIBDL" 147 99 148 AC_DEFINE_UNQUOTED(__PLATFORM__, "$target_os") 100 149 AC_DEFINE_UNQUOTED(__DYLIBSUFFIX__, ".$DLEXT") 150 101 151 102 152 AC_SUBST(LIBREGEX) … … 106 156 AC_SUBST(LINK_NEWT_APP_) 107 157 AC_SUBST(DLEXT) 158 AC_SUBST(MAKE_EXT) 108 159 109 160 -
NEWT0/trunk/ext.xcode/gnue.mode1
r36 r40 368 368 <key>TableOfContents</key> 369 369 <array> 370 <string>F5 9B846C0867E55200683824</string>370 <string>F5C2E8DC08AAE52A00C9B596</string> 371 371 <string>1CE0B1FE06471DED0097A5F4</string> 372 <string>F5 9B846D0867E55200683824</string>372 <string>F5C2E8DD08AAE52A00C9B596</string> 373 373 <string>1CE0B20306471E060097A5F4</string> 374 374 <string>1CE0B20506471E060097A5F4</string> … … 504 504 <key>WindowOrderList</key> 505 505 <array> 506 <string>/ Volumes/Pawn/User/Development/Newt/NEWT0/ext.xcode</string>506 <string>/Users/gnue/Desktop/NEWT0_ipod/ext.xcode</string> 507 507 </array> 508 508 <key>WindowString</key> -
NEWT0/trunk/ext.xcode/gnue.pbxuser
r36 r40 120 120 ); 121 121 }; 122 PBXPerProjectTemplateStateSaveDate = 14 1026618;122 PBXPerProjectTemplateStateSaveDate = 145417511; 123 123 PBXPrepackagedSmartGroups_v2 = ( 124 124 { … … 544 544 RubberWindowFrame = "238 139 776 607 0 0 1024 746 "; 545 545 }; 546 PBXWorkspaceStateSaveDate = 14 1026618;546 PBXWorkspaceStateSaveDate = 145417511; 547 547 }; 548 548 sourceControlManager = F53BDA5B06784447005AE1FA; -
NEWT0/trunk/newt.xcode/gnue.mode1
r39 r40 186 186 <array/> 187 187 <key>OpenEditors</key> 188 <array> 189 <dict> 190 <key>Content</key> 191 <dict> 192 <key>PBXProjectModuleGUID</key> 193 <string>F5CD89570897FAC900C4CA85</string> 194 <key>PBXProjectModuleLabel</key> 195 <string>newt.l</string> 196 <key>PBXSplitModuleInNavigatorKey</key> 197 <dict> 198 <key>Split0</key> 199 <dict> 200 <key>PBXProjectModuleGUID</key> 201 <string>F5CD89580897FAC900C4CA85</string> 202 <key>PBXProjectModuleLabel</key> 203 <string>newt.l</string> 204 <key>_historyCapacity</key> 205 <integer>0</integer> 206 <key>bookmark</key> 207 <string>F5CD89E3089800DC00C4CA85</string> 208 <key>history</key> 209 <array> 210 <string>F5CD89590897FAC900C4CA85</string> 211 </array> 212 </dict> 213 <key>SplitCount</key> 214 <string>1</string> 215 </dict> 216 <key>StatusBarVisibility</key> 217 <true/> 218 </dict> 219 <key>Geometry</key> 220 <dict> 221 <key>Frame</key> 222 <string>{{0, 20}, {750, 461}}</string> 223 <key>PBXModuleWindowStatusBarHidden2</key> 224 <false/> 225 <key>RubberWindowFrame</key> 226 <string>130 134 750 502 0 0 1024 746 </string> 227 </dict> 228 </dict> 229 </array> 188 <array/> 230 189 <key>PerspectiveWidths</key> 231 190 <array> … … 316 275 </array> 317 276 <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> 318 <string>{{0, 496}, {186, 506}}</string>277 <string>{{0, 633}, {186, 506}}</string> 319 278 </dict> 320 279 <key>PBXTopSmartGroupGIDs</key> … … 335 294 </array> 336 295 <key>RubberWindowFrame</key> 337 <string> 174 162815 565 0 0 1024 746 </string>296 <string>289 144 815 565 0 0 1024 746 </string> 338 297 </dict> 339 298 <key>Module</key> … … 365 324 <integer>0</integer> 366 325 <key>bookmark</key> 367 <string>F5C D89E2089800DC00C4CA85</string>326 <string>F5C2E8EC08AAE54500C9B596</string> 368 327 <key>history</key> 369 328 <array> 370 329 <string>F5547480088A7A9B001E9DDF</string> 371 330 <string>F5547481088A7A9B001E9DDF</string> 372 <string>F5547482088A7A9B001E9DDF</string>373 331 <string>F5547483088A7A9B001E9DDF</string> 374 332 <string>F5547484088A7A9B001E9DDF</string> … … 376 334 <string>F554750C088A7E98001E9DDF</string> 377 335 <string>F5547563088A81DE001E9DDF</string> 378 <string>F5547564088A81DE001E9DDF</string>379 336 <string>F5547565088A81DE001E9DDF</string> 380 337 <string>F5547566088A81DE001E9DDF</string> … … 383 340 <string>F5CD88C10897ED1600C4CA85</string> 384 341 <string>F5CD890F0897F45600C4CA85</string> 385 <string>F5CD89520897FAC900C4CA85</string>386 342 <string>F5CD89BC0897FF6700C4CA85</string> 387 <string>F5CD89BD0897FF6700C4CA85</string>388 343 <string>F5CD89D70898008600C4CA85</string> 389 <string>F5CD89D80898008600C4CA85</string> 344 <string>F532AA3C08AADBB500EE12BF</string> 345 <string>F532AA3D08AADBB500EE12BF</string> 346 <string>F532AA6D08AADC9500EE12BF</string> 347 <string>F5C2E8E408AAE54000C9B596</string> 348 <string>F5C2E8E508AAE54000C9B596</string> 390 349 </array> 391 350 <key>prevStack</key> … … 409 368 <string>F5CD89550897FAC900C4CA85</string> 410 369 <string>F5CD89BE0897FF6700C4CA85</string> 411 <string>F5CD89BF0897FF6700C4CA85</string> 412 <string>F5CD89D90898008600C4CA85</string> 370 <string>F5C2E8E608AAE54000C9B596</string> 413 371 </array> 414 372 </dict> … … 424 382 <string>{{0, 0}, {607, 363}}</string> 425 383 <key>RubberWindowFrame</key> 426 <string> 174 162815 565 0 0 1024 746 </string>384 <string>289 144 815 565 0 0 1024 746 </string> 427 385 </dict> 428 386 <key>Module</key> … … 444 402 <string>{{0, 368}, {607, 156}}</string> 445 403 <key>RubberWindowFrame</key> 446 <string> 174 162815 565 0 0 1024 746 </string>404 <string>289 144 815 565 0 0 1024 746 </string> 447 405 </dict> 448 406 <key>Module</key> … … 468 426 <key>TableOfContents</key> 469 427 <array> 470 <string>F5C D89C10897FF6700C4CA85</string>428 <string>F5C2E8E808AAE54000C9B596</string> 471 429 <string>1CE0B1FE06471DED0097A5F4</string> 472 <string>F5C D89C20897FF6700C4CA85</string>430 <string>F5C2E8E908AAE54000C9B596</string> 473 431 <string>1CE0B20306471E060097A5F4</string> 474 432 <string>1CE0B20506471E060097A5F4</string> … … 604 562 <key>WindowOrderList</key> 605 563 <array> 606 <string>F5AE5683082409020043A79D</string> 607 <string>1C530D57069F1CE1000CFCEE</string> 608 <string>1C0AD2B3069F1EA900FABCE6</string> 609 <string>F5CD89570897FAC900C4CA85</string> 610 <string>/Volumes/Pawn/User/Development/Newt/NEWT0/newt.xcode</string> 564 <string>/Users/gnue/Desktop/NEWT0_ipod/newt.xcode</string> 611 565 </array> 612 566 <key>WindowString</key> 613 <string> 174 162815 565 0 0 1024 746 </string>567 <string>289 144 815 565 0 0 1024 746 </string> 614 568 <key>WindowTools</key> 615 569 <array> … … 627 581 <array> 628 582 <dict> 629 <key>BecomeActive</key>630 <true/>631 583 <key>ContentConfiguration</key> 632 584 <dict> … … 634 586 <string>1CD0528F0623707200166675</string> 635 587 <key>PBXProjectModuleLabel</key> 636 <string>Newt Env.c</string>588 <string>NewtFile.c</string> 637 589 <key>StatusBarVisibility</key> 638 590 <true/> … … 651 603 </dict> 652 604 <dict> 605 <key>BecomeActive</key> 606 <true/> 653 607 <key>ContentConfiguration</key> 654 608 <dict> … … 690 644 <array> 691 645 <string>F5AE5683082409020043A79D</string> 692 <string>F5 CD89BA0897FF6600C4CA85</string>646 <string>F532AA2B08AADB6500EE12BF</string> 693 647 <string>1CD0528F0623707200166675</string> 694 648 <string>XCMainBuildResultsModuleGUID</string> … … 701 655 <string>F5AE5683082409020043A79D</string> 702 656 <key>WindowToolIsVisible</key> 703 < false/>657 <true/> 704 658 </dict> 705 659 <dict> … … 821 775 <array> 822 776 <dict> 823 <key>BecomeActive</key>824 <true/>825 777 <key>ContentConfiguration</key> 826 778 <dict> … … 828 780 <string>1CDD528C0622207200134675</string> 829 781 <key>PBXProjectModuleLabel</key> 830 <string>Newt Obj.h</string>782 <string>NewtFile.c</string> 831 783 <key>StatusBarVisibility</key> 832 784 <true/> … … 837 789 <string>{{0, 0}, {788, 401}}</string> 838 790 <key>RubberWindowFrame</key> 839 <string> 214 87788 659 0 0 1024 746 </string>791 <string>488 83 788 659 0 0 1024 746 </string> 840 792 </dict> 841 793 <key>Module</key> … … 849 801 </dict> 850 802 <dict> 803 <key>BecomeActive</key> 804 <true/> 851 805 <key>ContentConfiguration</key> 852 806 <dict> … … 861 815 <string>{{0, 406}, {788, 212}}</string> 862 816 <key>RubberWindowFrame</key> 863 <string> 214 87788 659 0 0 1024 746 </string>817 <string>488 83 788 659 0 0 1024 746 </string> 864 818 </dict> 865 819 <key>Module</key> … … 884 838 <array> 885 839 <string>1C530D57069F1CE1000CFCEE</string> 886 <string>F5C D897F0897FC1000C4CA85</string>887 <string>F5C D89800897FC1000C4CA85</string>840 <string>F5C2E8BE08AAE43C00C9B596</string> 841 <string>F5C2E8BF08AAE43C00C9B596</string> 888 842
