Skip to content

Commit

Permalink
Enable FreeBSD Compile
Browse files Browse the repository at this point in the history
Added include and library paths for opengl and jpeg.

Changed make_installer to handle FreeBSD's libSDL.so, which is not a
symbolic link. Also switched to 'bash' because the built-in pwd command
in 'sh' produces a minor error if the wings directory is a symbolic
link.

NOTE: Wings now compiles cleanly on FreeBSD.
  • Loading branch information
Anthony D'Agostino committed Oct 8, 2009
1 parent 3e96864 commit 5734ad5
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion plugins_src/accel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ else
GL_LIBS =
else
LIBS = -shared -fpic
GL_LIBS = -lGLU -lGL
GL_LIBS = -L/usr/local/lib -lGLU -lGL
CFLAGS = $(COMMON_CFLAGS)
endif
endif
Expand Down
1 change: 1 addition & 0 deletions plugins_src/jpeg/Makefile
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ else
$(LIBDIR)/wings_jpeg_image_drv.so: wings_jpeg_image_drv.c
install -d $(LIBDIR)
gcc -o $(LIBDIR)/wings_jpeg_image_drv.so -I$(ERL_INC) \
-I/usr/local/include -L/usr/local/lib \
wings_jpeg_image_drv.c $(LIBS)

endif
Expand Down
Empty file modified plugins_src/jpeg/wings_jpeg_image_drv.c
100755 → 100644
Empty file.
Empty file modified plugins_src/jpeg/wp8_jpeg_image.erl
100755 → 100644
Empty file.
3 changes: 2 additions & 1 deletion unix/make_installer
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash
#
# Script for creating a self-contained Wings package for Unix systems.
#
Expand Down Expand Up @@ -96,6 +96,7 @@ sdl_lib=`ldd "$dest/priv/sdl_driver.so" | awk '$1 ~ /^libSDL/ { print $3}'`
sdl_lib_name=`basename $sdl_lib`
if [ ! -L $sdl_lib ]; then
echo `basename $0`: "$sdl_lib expected to be a symlink"
$INSTALL -c $sdl_lib "$dest/priv"
else
lib_dir=`dirname $sdl_lib`
linkname=`readlink $sdl_lib`
Expand Down

0 comments on commit 5734ad5

Please sign in to comment.