blendelf-git/compile.diff

   1 diff --git a/Makefile b/Makefile
   2 index 955506c..c905d47 100644
   3 --- a/Makefile
   4 +++ b/Makefile
   5 @@ -4,16 +4,16 @@ DEV_CFLAGS = -g -Wall -DELF_PLAYER -DELF_LINUX
   6  STA_CFLAGS = -Wall -O2 -DELF_PLAYER -DELF_LINUX
   7  SHR_CFLAGS = -fPIC -Wall -O2 -DELF_LINUX
   8
   9 -INCS = -Igfx -Ielf -I/usr/include/lua5.1 -I/usr/include/freetype2
  10 +INCS = -Igfx -Ielf -I/usr/include/lua5.1 -I/usr/include/freetype2 -I/usr/include/bullet
  11
  12  BLENDELF_LIBS = -lGL -lGLEW -lglfw -lXxf86vm -lXrandr -lXrender -pthread \
  13 -       -lfreeimage -lvorbisfile -lvorbis -logg -lopenal -llua5.1 -lfreetype \
  14 +       -lfreeimage -lvorbisfile -lvorbis -logg -lopenal -llua -lfreetype \
  15         -lBulletDynamics -lLinearMath -lBulletCollision -lassimp
  16
  17  BLENDELF_STATIC_LIBS = -lGL -lGLU /usr/lib/libGLEW.a /usr/lib/libglfw.a \
  18         /usr/lib/libXxf86vm.a /usr/lib/libXrandr.a /usr/lib/libXrender.a \
  19         /usr/lib/libvorbisfile.a /usr/lib/libvorbis.a /usr/lib/libogg.a \
  20 -       /usr/lib/liblua5.1.a \
  21 +       /usr/lib/liblua.a \
  22         /usr/local/lib/libBulletDynamics.a \
  23         /usr/local/lib/libLinearMath.a \
  24         /usr/local/lib/libBulletCollision.a \
  25 @@ -27,7 +27,7 @@ all:
  26         gcc -c elf/scripting.c $(DEV_CFLAGS) $(INCS)
  27         g++ -c elf/physics.cpp $(DEV_CFLAGS) $(INCS)
  28         gcc -c elf/binds.c $(DEV_CFLAGS) $(INCS)
  29 -       gcc -Wl,-rpath,linux_libraries -o blendelf *.o $(DEV_CFLAGS) $(BLENDELF_LIBS)
  30 +       gcc -Wl,-rpath,linux_libraries -o blendelfd *.o $(DEV_CFLAGS) $(BLENDELF_LIBS)
  31         rm *.o
  32
  33  static:
  34 @@ -38,7 +38,7 @@ static:
  35         gcc -c elf/scripting.c $(STA_CFLAGS) $(INCS)
  36         g++ -c elf/physics.cpp $(STA_CFLAGS) $(INCS)
  37         gcc -c elf/binds.c $(STA_CFLAGS) $(INCS)
  38 -       gcc -Wl,-rpath,linux_libraries -o blendelf *.o $(STA_CFLAGS) $(BLENDELF_STATIC_LIBS)
  39 +       gcc -Wl,-rpath,linux_libraries -o blendelf *.o $(STA_CFLAGS) $(BLENDELF_LIBS)
  40         rm *.o
  41
  42  shared:
  43 @@ -49,6 +49,6 @@ shared:
  44         gcc -c -fPIC elf/scripting.c $(SHR_CFLAGS) $(INCS)
  45         g++ -c -fPIC elf/physics.cpp $(SHR_CFLAGS) $(INCS)
  46         gcc -c -fPIC elf/binds.c $(SHR_CFLAGS) $(INCS)
  47 -       gcc -Wl,-rpath,linux_libraries -shared -o libblendelf.so *.o $(SHR_CFLAGS) $(BLENDELF_STATIC_LIBS)
  48 +       gcc -Wl,-rpath,linux_libraries -shared -o libblendelf.so *.o $(SHR_CFLAGS) $(BLENDELF_LIBS)
  49         rm *.o
  50
  51 diff --git a/genwraps.py b/genwraps.py
  52 index 0424c66..aeb2bec 100644
  53 --- a/genwraps.py
  54 +++ b/genwraps.py
  55 @@ -677,7 +677,7 @@ class Function:
  56                 for param in self.params:
  57                         dstr += param.type+'['+param.orig_type+'] '+param.name+', '
  58                 dstr += ')'
  59 -               print dstr
  60 +               print(dstr)
  61
  62  def get_parts(line):
  63         tstr = ''