[Scummvm-cvs-logs] SF.net SVN: scummvm:[33308] residual/trunk
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sat Jul 26 20:05:09 CEST 2008
Revision: 33308
http://scummvm.svn.sourceforge.net/scummvm/?rev=33308&view=rev
Author: aquadran
Date: 2008-07-26 18:05:08 +0000 (Sat, 26 Jul 2008)
Log Message:
-----------
not use define anymore
Modified Paths:
--------------
residual/trunk/Makefile
residual/trunk/engine/lua/liolib.cpp
Modified: residual/trunk/Makefile
===================================================================
--- residual/trunk/Makefile 2008-07-26 18:01:42 UTC (rev 33307)
+++ residual/trunk/Makefile 2008-07-26 18:05:08 UTC (rev 33308)
@@ -7,7 +7,7 @@
srcdir ?= .
-DEFINES := -DHAVE_CONFIG_H -DLUA_ADD_CUSTOM_FOPEN
+DEFINES := -DHAVE_CONFIG_H
LDFLAGS :=
INCLUDES := -I. -I$(srcdir)
LIBS :=
Modified: residual/trunk/engine/lua/liolib.cpp
===================================================================
--- residual/trunk/engine/lua/liolib.cpp 2008-07-26 18:01:42 UTC (rev 33307)
+++ residual/trunk/engine/lua/liolib.cpp 2008-07-26 18:05:08 UTC (rev 33308)
@@ -13,9 +13,7 @@
#include <time.h>
#include <errno.h>
-#ifdef LUA_ADD_CUSTOM_FOPEN
-#include "../resource.h"
-#endif
+#include "engine/resource.h"
#define CLOSEDTAG 2
#define IOTAG 1
@@ -119,10 +117,8 @@
current = popen(s+1, "r");
else {
current = fopen(s, "r");
-#ifdef LUA_ADD_CUSTOM_FOPEN
// if (current == NULL)
// current = g_resourceloader->openNewStream(s);
-#endif
}
if (current == NULL) {
pushresult(0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list