ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

It actually builds now (but doesn't link)

This commit is contained in:
Akop Karapetyan 2019-10-09 03:39:36 -07:00 committed by tmaul
parent 4adf547767
commit 335873119a
5 changed files with 13 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefile.burner_pi_rules
View File

@ -1,4 +1,4 @@
alldir += burner burner/pi burner/sdl dep/kaillera/client dep/libs/libpng dep/libs/lib7z dep/libs/zlib intf intf/video \
alldir += burner burner/pi burner/sdl dep/libs/libpng dep/libs/lib7z dep/libs/zlib intf intf/video \
intf/video/scalers intf/video/pi intf/audio intf/audio/sdl intf/input intf/input/pi intf/cd intf/cd/sdl \
intf/perfcount intf/perfcount/pi dep/generated
@ -12,8 +12,6 @@ depobj += neocdlist.o \
png.o pngerror.o pngget.o pngmem.o pngpread.o pngread.o pngrio.o pngrtran.o pngrutil.o pngset.o pngtrans.o pngwio.o \
pngwrite.o pngwtran.o pngwutil.o \
\
net.o \
\
aud_dsp.o aud_interface.o cd_interface.o inp_interface.o interface.o lowpass2.o prf_interface.o vid_interface.o \
vid_softfx.o vid_support.o \
\

17
makefile.pi
View File

@ -40,7 +40,8 @@ srcdir = src/
include makefile.burn_rules
include makefile.burner_pi_rules
incdir = $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I$(srcdir)dep/pi/include
incdir = $(foreach dir,$(alldir),-I$(srcdir)$(dir)) -I$(objdir)dep/generated -I$(srcdir)dep/pi/include \
-I/usr/include/SDL
autdep = $(depobj:.o=.d)
drvdep = $(drvsrc:.o=.d)
@ -255,11 +256,7 @@ ifeq ($(MAKELEVEL),2)
$(objdir)/drivers.o: $(autdrv)
@echo Linking drivers...
ifdef BUILD_X64_EXE
@$(LD) -m64 -r -nostdlib -o $@ $^
else
@$(LD) -m32 -r -nostdlib -o $@ $^
endif
@$(LD) -r -nostdlib -o $@ $^
$(NAME): $(allobj) $(objdir)/drivers.o
@echo
@ -337,16 +334,16 @@ $(objdir)cpu/m68k/m68kcpu.o: $(srcdir)cpu/m68k/m68kcpu.c $(objdir)dep/generated/
@echo Compiling Musashi MC680x0 core \(m68kcpu.c\)...
@$(CC) $(CFLAGS) -c $(srcdir)cpu/m68k/m68kcpu.c -o $(objdir)cpu/m68k/m68kcpu.o
$(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake.exe $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
$(objdir)cpu/m68k/m68kops.o: $(objdir)cpu/m68k/m68kmake $(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c $(srcdir)cpu/m68k/m68k.h $(srcdir)cpu/m68k/m68kconf.h
@echo Compiling Musashi MC680x0 core \(m68kops.c\)...
@$(CC) $(CFLAGS) -c $(objdir)dep/generated/m68kops.c -o $(objdir)cpu/m68k/m68kops.o
$(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c: $(objdir)cpu/m68k/m68kmake.exe $(srcdir)cpu/m68k/m68k_in.c
$(objdir)dep/generated/m68kops.h $(objdir)dep/generated/m68kops.c: $(objdir)cpu/m68k/m68kmake $(srcdir)cpu/m68k/m68k_in.c
$(objdir)/cpu/m68k/m68kmake $(objdir)dep/generated/ $(srcdir)cpu/m68k/m68k_in.c
$(objdir)cpu/m68k/m68kmake.exe: $(srcdir)cpu/m68k/m68kmake.c
$(objdir)cpu/m68k/m68kmake: $(srcdir)cpu/m68k/m68kmake.c
@echo Compiling Musashi MC680x0 core \(m68kmake.c\)...
@$(CC) $(CFLAGS) $(srcdir)cpu/m68k/m68kmake.c -o $(objdir)cpu/m68k/m68kmake.exe
@$(CC) $(CFLAGS) $(srcdir)cpu/m68k/m68kmake.c -o $(objdir)cpu/m68k/m68kmake
#

4
src/burn/burn.cpp
View File

@ -196,7 +196,7 @@ extern "C" TCHAR* BurnDrvGetText(UINT32 i)
if (!(i & DRV_ASCIIONLY)) {
switch (i & 0xFF) {
#ifndef __LIBRETRO__
#if !defined(__LIBRETRO__) && !defined(BUILD_PI)
case DRV_FULLNAME:
pszStringW = pDriver[nBurnDrvActive]->szFullNameW;
@ -236,7 +236,7 @@ extern "C" TCHAR* BurnDrvGetText(UINT32 i)
}
break;
#endif // __LIBRETRO__
#endif // !defined(__LIBRETRO__) && !defined(BUILD_PI)
case DRV_COMMENT:
pszStringW = pDriver[nBurnDrvActive]->szCommentW;
break;

8
src/burner/sdl/tchar.h
View File

@ -16,10 +16,6 @@ typedef char TCHAR;
typedef char _TCHAR;
#endif
// WTF? This is a normal string function!
// damn linux. :)
#define wcslen(void)
#define _tcslen strlen
#define _tcscpy strcpy
#define _tcsncpy strncpy
@ -37,6 +33,7 @@ typedef char _TCHAR;
#define _tcsicmp strcasecmp
#define _tcsnicmp strncasecmp
#define _tcstol strtol
#define _tcsrchr strrchr
#define _tcsstr strstr
#define _fgetts fgets
@ -46,7 +43,8 @@ typedef char _TCHAR;
#define _tfopen fopen
#define _stricmp strcmp
#define _stricmp strcasecmp
#define stricmp strcasecmp
#define _strnicmp strncmp
// FBA function, change this!

60
src/dep/pi/include/tchar.h
View File

@ -1,60 +0,0 @@
#include <stdint.h>
#ifdef _UNICODE
//TODO: bah
#include <wchar.h>
#define __TEXT(q) L##q
typedef wchar_t TCHAR;
typedef wchar_t _TCHAR;
#else
#define __TEXT(q) q
#ifndef RC_INVOKED
typedef char TCHAR;
typedef char _TCHAR;
#endif
// WTF? This is a normal string function!
// damn linux. :)
#define wcslen(void)
#define _tcslen strlen
#define _tcscpy strcpy
#define _tcsncpy strncpy
#define _tprintf printf
#define _vstprintf vsprintf
#define _vsntprintf vsnprintf
#define _stprintf sprintf
#define _sntprintf snprintf
#define _ftprintf fprintf
#define _tsprintf sprintf
#define _tcscmp strcmp
#define _tcsncmp strncmp
#define _tcsicmp strcasecmp
#define _tcsnicmp strncasecmp
#define _tcstol strtol
#define _tcsstr strstr
#define _tcsrchr strrchr
#define _fgetts fgets
#define _fputts fputs
#define _istspace isspace
#define _tfopen fopen
#define _stricmp strcmp
#define stricmp strcasecmp
#define _strnicmp strncmp
// FBA function, change this!
#define dprintf printf
#endif
#define _TEXT(x) __TEXT(x)
#define _T(x) __TEXT(x)