Ticket #11811: with-and-without-universal.diff

File with-and-without-universal.diff, 3.0 KB (added by meissnem@…, 17 years ago)

  • src/Makefile 

    diff -u -r lua-5.1.2.orig-patched/src/Makefile lua-5.1.2/src/Makefile
    old new  
    1414RM= rm -f
    1515LIBS= -lm $(MYLIBS)
    1616
    17 MYCFLAGS=
    18 MYLDFLAGS=-L/opt/local/lib
     17MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "
     18MYLDFLAGS=-arch i386 -arch ppc -L/opt/local/lib
    1919MYLIBS=
    2020
    2121# == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE =========
    … …  
    8181        @echo "   $(PLATS)"
    8282
    8383aix:
    84         $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS=-L/opt/local/lib"-brtl -bexpall"
     84        $(MAKE) all CC="xlc" CFLAGS="-O2 -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl" MYLDFLAGS=-arch i386 -arch ppc -L/opt/local/lib"-brtl -bexpall"
    8585
    8686ansi:
    87         $(MAKE) all MYCFLAGS=-DLUA_ANSI
     87        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "-DLUA_ANSI
    8888
    8989bsd:
    90         $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
     90        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc ""-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E"
    9191
    9292freebsd:
    93         $(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
     93        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc ""-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lreadline"
    9494
    9595generic:
    96         $(MAKE) all MYCFLAGS=
     96        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "
    9797
    9898linux:
    99         $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
     99        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses"
    100100
    101101macosx:
    102         $(MAKE) all MYCFLAGS="-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline"
    103 #       $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
     102        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc ""-DLUA_USE_MACOSX -DLUA_USE_READLINE" MYLIBS="-lreadline"
     103#       $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "-DLUA_USE_MACOSX
    104104# use this on Mac OS X 10.4
    105105
    106106mingw:
    107107        $(MAKE) "LUA_A=lua51.dll" "LUA_T=lua.exe" \
    108108        "AR=$(CC) -shared -o" "RANLIB=strip --strip-unneeded" \
    109         "MYCFLAGS=-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-L/opt/local/lib-s" lua.exe
     109        "MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "-DLUA_BUILD_AS_DLL" "MYLIBS=" "MYLDFLAGS=-arch i386 -arch ppc -L/opt/local/lib-s" lua.exe
    110110        $(MAKE) "LUAC_T=luac.exe" luac.exe
    111111
    112112posix:
    113         $(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
     113        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "-DLUA_USE_POSIX
    114114
    115115solaris:
    116         $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
     116        $(MAKE) all MYCFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc ""-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-ldl"
    117117
    118118# list targets that do not create files (but not all makes understand .PHONY)
    119119.PHONY: all $(PLATS) default o a clean depend echo none