git.openpandora.org
/
openpandora.oe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c377a1
)
fusilli-client: update build
author
Grazvydas Ignotas
<notasas@gmail.com>
Tue, 11 Nov 2014 21:45:04 +0000
(23:45 +0200)
committer
Grazvydas Ignotas
<notasas@gmail.com>
Tue, 11 Nov 2014 21:45:04 +0000
(23:45 +0200)
recipes/fusilli-client/files/sparrowDefines.h
patch
|
blob
|
history
recipes/fusilli-client/files/sparrowNet.c
patch
|
blob
|
history
recipes/fusilli-client/fusilli-client_git.bb
patch
|
blob
|
history
diff --git
a/recipes/fusilli-client/files/sparrowDefines.h
b/recipes/fusilli-client/files/sparrowDefines.h
index
06ad68e
..
35e034c
100644
(file)
--- a/
recipes/fusilli-client/files/sparrowDefines.h
+++ b/
recipes/fusilli-client/files/sparrowDefines.h
@@
-24,7
+24,7
@@
#define _SPARROW_DEFINES_H
/* These are defines for creating or using the library in C or C++ */
#define _SPARROW_DEFINES_H
/* These are defines for creating or using the library in C or C++ */
-#ifdef WIN32
+#ifdef
_
WIN32
#include <windows.h>
#if BUILDING_DLL
# define DLLIMPORT __declspec (dllexport)
#include <windows.h>
#if BUILDING_DLL
# define DLLIMPORT __declspec (dllexport)
@@
-336,7
+336,7
@@
#endif
#define SP_BUTTON_START_NOWASD SP_BUTTON_START
#endif
#define SP_BUTTON_START_NOWASD SP_BUTTON_START
-#ifndef
X86CPU
+#ifndef
DESKTOP
#define SP_BUTTON_SELECT_NOWASD SP_BUTTON_SELECT
#define SP_BUTTON_L_NOWASD SP_BUTTON_L
#define SP_BUTTON_R_NOWASD SP_BUTTON_R
#define SP_BUTTON_SELECT_NOWASD SP_BUTTON_SELECT
#define SP_BUTTON_L_NOWASD SP_BUTTON_L
#define SP_BUTTON_R_NOWASD SP_BUTTON_R
@@
-498,7
+498,7
@@
#define SP_PRACTICE_4_NOWASD_NAME SP_BUTTON_Y_NOWASD_NAME
#endif
#define SP_PRACTICE_4_NOWASD_NAME SP_BUTTON_Y_NOWASD_NAME
#endif
-#ifndef
X86CPU
+#ifndef
DESKTOP
#define SP_BUTTON_START_NOWASD_NAME SP_BUTTON_START_NAME
#define SP_BUTTON_SELECT_NOWASD_NAME SP_BUTTON_SELECT_NAME
#define SP_BUTTON_L_NOWASD_NAME SP_BUTTON_L_NAME
#define SP_BUTTON_START_NOWASD_NAME SP_BUTTON_START_NAME
#define SP_BUTTON_SELECT_NOWASD_NAME SP_BUTTON_SELECT_NAME
#define SP_BUTTON_L_NOWASD_NAME SP_BUTTON_L_NAME
@@
-621,7
+621,7
@@
#define SP_DEVICE_STRING "GCW Zero"
#elif defined PANDORA
#define SP_DEVICE_STRING "Open Pandora"
#define SP_DEVICE_STRING "GCW Zero"
#elif defined PANDORA
#define SP_DEVICE_STRING "Open Pandora"
-#elif defined WIN32
+#elif defined
_
WIN32
#define SP_DEVICE_STRING "Windows PC"
#else
#define SP_DEVICE_STRING "Linux PC"
#define SP_DEVICE_STRING "Windows PC"
#else
#define SP_DEVICE_STRING "Linux PC"
diff --git
a/recipes/fusilli-client/files/sparrowNet.c
b/recipes/fusilli-client/files/sparrowNet.c
index
7feab5c
..
e0986a0
100644
(file)
--- a/
recipes/fusilli-client/files/sparrowNet.c
+++ b/
recipes/fusilli-client/files/sparrowNet.c
@@
-502,7
+502,7
@@
int spNetC4AUberThread(getgenericPointer data)
#ifdef REALGP2X
//TODO: Implement!
SDL_Delay(100);
#ifdef REALGP2X
//TODO: Implement!
SDL_Delay(100);
- #elif defined WIN32
+ #elif defined
_
WIN32
SDL_Delay(100);
#else
usleep(100000);
SDL_Delay(100);
#else
usleep(100000);
@@
-610,7
+610,7
@@
void internal_CreateDirectoryChain( const char* directories)
{
char oldChar = endOfString[0];
endOfString[0] = 0;
{
char oldChar = endOfString[0];
endOfString[0] = 0;
- #ifdef WIN32
+ #ifdef
_
WIN32
if (CreateDirectory(directoriesCopy,NULL))
{}
if (CreateDirectory(directoriesCopy,NULL))
{}
@@
-652,7
+652,7
@@
void internal_CreateDirectoryChain( const char* directories)
sprintf(filename,"%s/c4a-mame/c4a-prof",locate_filename); \
} \
}
sprintf(filename,"%s/c4a-mame/c4a-prof",locate_filename); \
} \
}
-#elif defined GCW || (defined
X86CPU && !defined
WIN32)
+#elif defined GCW || (defined
DESKTOP && !defined _
WIN32)
#define PROFILE_FILENAME_MAKRO char filename[256]; \
sprintf(filename,"%s/.config/compo4all",getenv("HOME"));\
internal_CreateDirectoryChain(filename);\
#define PROFILE_FILENAME_MAKRO char filename[256]; \
sprintf(filename,"%s/.config/compo4all",getenv("HOME"));\
internal_CreateDirectoryChain(filename);\
@@
-1283,7
+1283,7
@@
int c4a_commit_thread(void* data)
break;
}
}
break;
}
}
- #ifdef WIN32
+ #ifdef
_
WIN32
DeleteFile(spCacheFilename);
#else
remove(spCacheFilename);
DeleteFile(spCacheFilename);
#else
remove(spCacheFilename);
@@
-1353,7
+1353,7
@@
int already_in_highscore(spNetC4AScorePointer scoreList,spNetC4AProfilePointer p
#define SET_SYSTEM(system) sprintf(system,"gcw");
#elif defined(PANDORA)
#define SET_SYSTEM(system) sprintf(system,"pandora");
#define SET_SYSTEM(system) sprintf(system,"gcw");
#elif defined(PANDORA)
#define SET_SYSTEM(system) sprintf(system,"pandora");
-#elif defined(WIN32)
+#elif defined(
_
WIN32)
#define SET_SYSTEM(system) sprintf(system,"win32");
#else
#define SET_SYSTEM(system) sprintf(system,"linux");
#define SET_SYSTEM(system) sprintf(system,"win32");
#else
#define SET_SYSTEM(system) sprintf(system,"linux");
@@
-1743,7
+1743,7
@@
PREFIX void spNetC4ADeleteProfileFile()
{
PROFILE_FILENAME_MAKRO
//Copied from spRemoveFile to avoid dependencies
{
PROFILE_FILENAME_MAKRO
//Copied from spRemoveFile to avoid dependencies
-#ifdef WIN32
+#ifdef
_
WIN32
DeleteFile(filename);
#else
remove(filename);
DeleteFile(filename);
#else
remove(filename);
diff --git
a/recipes/fusilli-client/fusilli-client_git.bb
b/recipes/fusilli-client/fusilli-client_git.bb
index
1ff70cb
..
edc8a43
100644
(file)
--- a/
recipes/fusilli-client/fusilli-client_git.bb
+++ b/
recipes/fusilli-client/fusilli-client_git.bb
@@
-4,7
+4,8
@@
LICENSE = "GPLv3"
DEPENDS = "virtual/libsdl libsdl-net pandora-libpnd"
RDEPENDS = "libsdl-net pandora-libpnd"
DEPENDS = "virtual/libsdl libsdl-net pandora-libpnd"
RDEPENDS = "libsdl-net pandora-libpnd"
-PR = "r0"
+PR = "r1"
+PR_append = "+gitr${SRCPV}"
SRC_URI = " \
git://github.com/theZiz/fusilli-client.git;protocol=git;branch=master \
SRC_URI = " \
git://github.com/theZiz/fusilli-client.git;protocol=git;branch=master \
@@
-13,21
+14,18
@@
SRC_URI = " \
file://sparrowDefines.h \
"
file://sparrowDefines.h \
"
-SRCREV = "
60bb6d2d121eb23a59e6502d33ca1246be033710
"
+SRCREV = "
ef70184115cf3da4e2f611dc0f86c0d7fe991235
"
S = "${WORKDIR}/git"
S = "${WORKDIR}/git"
-CFLAGS += "-g -DPANDORA"
-# crazy
-CFLAGS += "-DX86CPU"
+CFLAGS += "-DMOBILE_DEVICE -DPANDORA"
do_compile() {
cp ${WORKDIR}/sparrowNet.c ${S}/
cp ${WORKDIR}/sparrowNet.h ${S}/
cp ${WORKDIR}/sparrowDefines.h ${S}/
do_compile() {
cp ${WORKDIR}/sparrowNet.c ${S}/
cp ${WORKDIR}/sparrowNet.h ${S}/
cp ${WORKDIR}/sparrowDefines.h ${S}/
- # not everyone knows how to write makefiles..
- oe_runmake CPP='${CC}' SPARROW_FOLDER=. LIB= STATIC=sparrowNet.c \
+ oe_runmake SPARROW_FOLDER=. LIB= STATIC=sparrowNet.c \
DYNAMIC='${LDFLAGS} -lSDL_net -lSDL -lpnd'
}
DYNAMIC='${LDFLAGS} -lSDL_net -lSDL -lpnd'
}