Two small things forgotten from previous commit.

This commit is contained in:
dcoppa 2011-01-17 11:39:20 +00:00
parent 317a6e18ee
commit cbfe6774cc
3 changed files with 27 additions and 13 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.15 2011/01/14 12:01:18 dcoppa Exp $ # $OpenBSD: Makefile,v 1.16 2011/01/17 11:39:20 dcoppa Exp $
COMMENT-main = physics-based drawing puzzle game COMMENT-main = physics-based drawing puzzle game
COMMENT-npcomplete = extra levels for physics-based drawing puzzle game COMMENT-npcomplete = extra levels for physics-based drawing puzzle game
DISTNAME = numptyphysics-0.3.r20090104 DISTNAME = numptyphysics-0.3.r20090104
PKGNAME-main = ${DISTNAME} PKGNAME-main = ${DISTNAME}
REVISION-main = 7 REVISION-main = 8
PKGNAME-npcomplete = npcomplete-0.0.r20090116 PKGNAME-npcomplete = npcomplete-0.0.r20090116
REVISION-npcomplete = 3 REVISION-npcomplete = 3

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Config_h,v 1.3 2011/01/14 12:01:18 dcoppa Exp $ $OpenBSD: patch-Config_h,v 1.4 2011/01/17 11:39:20 dcoppa Exp $
--- Config.h.orig Fri Oct 31 18:04:08 2008 --- Config.h.orig Fri Oct 31 18:04:08 2008
+++ Config.h Thu Jan 13 11:36:42 2011 +++ Config.h Mon Jan 17 12:14:05 2011
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
# define CLICK_TOLERANCE 16 //PIXELs # define CLICK_TOLERANCE 16 //PIXELs
#else #else
@ -19,14 +19,26 @@ $OpenBSD: patch-Config_h,v 1.3 2011/01/14 12:01:18 dcoppa Exp $
#endif #endif
#define DEFAULT_LEVEL_PATH INSTALL_BASE_PATH #define DEFAULT_LEVEL_PATH INSTALL_BASE_PATH
#define DEFAULT_RESOURCE_PATH DEFAULT_LEVEL_PATH #define DEFAULT_RESOURCE_PATH DEFAULT_LEVEL_PATH
@@ -67,10 +67,6 @@ @@ -68,10 +68,6 @@
# endif
#endif #endif
#define USER_LEVEL_PATH USER_BASE_PATH #define USER_LEVEL_PATH USER_BASE_PATH
-
-#define DEMO_TEMP_FILE "/tmp/demo.nph" -#define DEMO_TEMP_FILE "/tmp/demo.nph"
-#define HTTP_TEMP_FILE "/tmp/http.nph" -#define HTTP_TEMP_FILE "/tmp/http.nph"
-#define SEND_TEMP_FILE "/tmp/mailto:numptyphysics@gmail.com.nph" -#define SEND_TEMP_FILE "/tmp/mailto:numptyphysics@gmail.com.nph"
-
#define ICON_SCALE_FACTOR 4 #define ICON_SCALE_FACTOR 4
@@ -92,11 +88,6 @@ class Config
static const std::string& userDataDir()
{
static const std::string d = std::string(getenv("HOME")) + Os::pathSep + USER_BASE_PATH;
- return d;
- }
- static const std::string& planetRoot()
- {
- static const std::string d("http://xxx/planet.cgi");
return d;
}
};

View File

@ -1,12 +1,14 @@
$OpenBSD: patch-Makefile_am,v 1.1 2011/01/14 12:01:18 dcoppa Exp $ $OpenBSD: patch-Makefile_am,v 1.2 2011/01/17 11:39:20 dcoppa Exp $
--- Makefile.am.orig Thu Jan 13 11:30:25 2011 --- Makefile.am.orig Tue Nov 11 17:54:38 2008
+++ Makefile.am Thu Jan 13 11:30:40 2011 +++ Makefile.am Mon Jan 17 12:19:48 2011
@@ -19,8 +19,6 @@ numptyphysics_SOURCES = \ @@ -19,10 +19,7 @@ numptyphysics_SOURCES = \
Game.cpp \ Game.cpp \
Overlay.cpp \ Overlay.cpp \
Config.cpp \ Config.cpp \
- Http.cpp \ - Http.cpp \
- happyhttp.cpp \ - happyhttp.cpp \
zoomer.cpp \ zoomer.cpp \
OsHildon.cpp \ - OsHildon.cpp \
OsFreeDesktop.cpp \ OsFreeDesktop.cpp \
OsWin32.cpp