diff options
| author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2010-05-17 23:36:54 +0200 |
|---|---|---|
| committer | Heinz Wiesinger <pprkut@slackbuilds.org> | 2010-05-17 23:36:54 +0200 |
| commit | 4fd3f0508a438604b9557b7f0a355462f4d13a5f (patch) | |
| tree | 3ab7390ac31460b8a6c8e4f9fc966add5c8d55ee /games | |
| parent | 75e55ab32114eeaa7a3299166227e0097d135f77 (diff) | |
| download | slackbuilds-4fd3f0508a438604b9557b7f0a355462f4d13a5f.tar.gz | |
games/oblige: fix patch that got screwed up on import to git
Diffstat (limited to 'games')
| -rw-r--r-- | games/oblige/lua_compile_fixes.diff | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/games/oblige/lua_compile_fixes.diff b/games/oblige/lua_compile_fixes.diff index e11e57252d..a86af98975 100644 --- a/games/oblige/lua_compile_fixes.diff +++ b/games/oblige/lua_compile_fixes.diff @@ -2,52 +2,52 @@ diff -Naur oblige_351_src.orig/gui/Makefile.unixy oblige_351_src/gui/Makefile.un --- oblige_351_src.orig/gui/Makefile.unixy 2010-01-21 07:34:30.000000000 -0500 +++ oblige_351_src/gui/Makefile.unixy 2010-02-28 15:58:31.000000000 -0500 @@ -40,10 +40,10 @@ - FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg - - LUA_FLAGS=-I$(LUA_DIR)/src --LUA_LIBS=$(LUA_DIR)/src/liblua.a -+LUA_LIBS=-llua - - GLBSP_FLAGS=-I$(GLBSP_DIR)/src --GLBSP_LIBS=$(GLBSP_DIR)/libglbsp.a -+GLBSP_LIBS=-lglbsp - - CXXFLAGS=$(OPTIMISE) -Wall -DFHS_INSTALL -D$(OS) \ - $(FLTK_FLAGS) $(LUA_FLAGS) $(GLBSP_FLAGS) + FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg
+
+ LUA_FLAGS=-I$(LUA_DIR)/src
+-LUA_LIBS=$(LUA_DIR)/src/liblua.a
++LUA_LIBS=-llua
+
+ GLBSP_FLAGS=-I$(GLBSP_DIR)/src
+-GLBSP_LIBS=$(GLBSP_DIR)/libglbsp.a
++GLBSP_LIBS=-lglbsp
+
+ CXXFLAGS=$(OPTIMISE) -Wall -DFHS_INSTALL -D$(OS) \
+ $(FLTK_FLAGS) $(LUA_FLAGS) $(GLBSP_FLAGS)
diff -Naur oblige_351_src.orig/gui/hdr_lua.h oblige_351_src/gui/hdr_lua.h --- oblige_351_src.orig/gui/hdr_lua.h 2009-07-17 05:25:10.000000000 -0400 +++ oblige_351_src/gui/hdr_lua.h 2010-02-28 15:58:02.000000000 -0500 @@ -23,9 +23,7 @@ - - /* LUA Scripting Language */ - --#include "lua.h" --#include "lauxlib.h" --#include "lualib.h" -+#include "lua.hpp" - - #endif // __OB_HDR_LUA__ - +
+ /* LUA Scripting Language */
+
+-#include "lua.h"
+-#include "lauxlib.h"
+-#include "lualib.h"
++#include "lua.hpp"
+
+ #endif // __OB_HDR_LUA__
+
diff -Naur oblige_351_src.orig/vis_viewer/Makefile oblige_351_src/vis_viewer/Makefile --- oblige_351_src.orig/vis_viewer/Makefile 2009-10-01 05:01:34.000000000 -0400 +++ oblige_351_src/vis_viewer/Makefile 2010-02-28 15:59:43.000000000 -0500 @@ -23,15 +23,15 @@ - #--- Internal stuff from here ----------------------------------- - - FLTK_FLAGS=-I$(FLTK_DIR) --FLTK_LIBS=$(FLTK_DIR)/lib/libfltk_images.a \ -- $(FLTK_DIR)/lib/libfltk.a \ -+FLTK_LIBS=-lfltk_images \ -+ -lfltk \ - -lX11 -lXext -lpng -ljpeg - - LUA_FLAGS=-I$(LUA_DIR)/src --LUA_LIBS=$(LUA_DIR)/src/liblua.a -+LUA_LIBS=-llua - - GLBSP_FLAGS=-I$(GLBSP_DIR)/src --GLBSP_LIBS=$(GLBSP_DIR)/libglbsp.a -+GLBSP_LIBS=-lglbsp - - CXXFLAGS=$(OPTIMISE) -Wall -D$(OS) \ - $(FLTK_FLAGS) $(LUA_FLAGS) $(GLBSP_FLAGS) + #--- Internal stuff from here -----------------------------------
+
+ FLTK_FLAGS=-I$(FLTK_DIR)
+-FLTK_LIBS=$(FLTK_DIR)/lib/libfltk_images.a \
+- $(FLTK_DIR)/lib/libfltk.a \
++FLTK_LIBS=-lfltk_images \
++ -lfltk \
+ -lX11 -lXext -lpng -ljpeg
+
+ LUA_FLAGS=-I$(LUA_DIR)/src
+-LUA_LIBS=$(LUA_DIR)/src/liblua.a
++LUA_LIBS=-llua
+
+ GLBSP_FLAGS=-I$(GLBSP_DIR)/src
+-GLBSP_LIBS=$(GLBSP_DIR)/libglbsp.a
++GLBSP_LIBS=-lglbsp
+
+ CXXFLAGS=$(OPTIMISE) -Wall -D$(OS) \
+ $(FLTK_FLAGS) $(LUA_FLAGS) $(GLBSP_FLAGS)
|