libretro/NP2kai
1
0
Fork 0
mirror of https://github.com/libretro/NP2kai.git synced 2024-10-07 06:43:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build error 24

Browse Source
This commit is contained in:
AZO234 2020-04-22 08:40:44 +09:00
parent 79ef308ace
commit a996b59770
15 changed files with 131 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jni/Android.mk
View File

@ -1,3 +1,11 @@
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 0
SUPPORT_ASYNC_CPU ?= 0
SUPPORT_DIRENT = 1
LOCAL_PATH := $(call my-dir)
CORE_DIR := $(LOCAL_PATH)/..
@ -109,22 +117,16 @@ ifneq ($(STATIC_LINKING), 1)
$(NP2_PATH)/sdl2/libretro/libretro-common/string/stdstring.c
endif
USE_RTHREAD = 1
ifeq ($(USE_RTHREAD), 1)
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/rthreads/rthreads.c
endif
USE_RSEMAPHOE = 1
ifeq ($(USE_RSEMAPHOE), 1)
SOURCES_C += $(NP2_PATH)/sdl2/libretro/rsemaphore.c
endif
ifneq ($(NO_DIRENT), 1)
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/vfs/vfs_implementation.c
endif
COREFLAGS := -D__LIBRETRO__ $(INCFLAGS) $(NP2DEFINE) $(NP21DEFINE) -DSUPPORT_NP2_TICKCOUNT
ifeq ($(SUPPORT_NP2_THREAD), 1)
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/rthreads/rthreads.c \
$(NP2_PATH)/sdl2/libretro/rsemaphore.c
endif
ifeq ($(SUPPORT_DIRENT), 1)
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/vfs/vfs_implementation.c
endif
GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown")
COREFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"

45
np2_thread.h
View File

@ -7,8 +7,6 @@
#include "compiler.h"
#include <stdlib.h>
#if defined(NP2_THREAD_WIN)
#include <windows.h>
#include <process.h>
@ -45,15 +43,15 @@ extern "C" {
/* --- thread --- */
/* for caller */
void NP2_Thread_Create(NP2_Thread_t* pth, void*(*thread)(void*), void* param);
extern void NP2_Thread_Create(NP2_Thread_t* pth, void*(*thread)(void*), void* param);
/* for caller */
void NP2_Thread_Destroy(NP2_Thread_t* pth);
extern void NP2_Thread_Destroy(NP2_Thread_t* pth);
/* for callee */
int NP2_Thread_Exit(void* retval);
extern int NP2_Thread_Exit(void* retval);
/* for caller */
void NP2_Thread_Wait(NP2_Thread_t* pth, void** retval);
extern void NP2_Thread_Wait(NP2_Thread_t* pth, void** retval);
/* for caller */
void NP2_Thread_Detach(NP2_Thread_t* pth);
extern void NP2_Thread_Detach(NP2_Thread_t* pth);
/* --- semaphore --- */
@ -68,13 +66,13 @@ typedef ssem_t* NP2_Semaphore_t;
#endif
/* for caller */
void NP2_Semaphore_Create(NP2_Semaphore_t* psem, const unsigned int initcount);
extern void NP2_Semaphore_Create(NP2_Semaphore_t* psem, const unsigned int initcount);
/* for caller */
void NP2_Semaphore_Destroy(NP2_Semaphore_t* psem);
extern void NP2_Semaphore_Destroy(NP2_Semaphore_t* psem);
/* for caller/callee */
void NP2_Semaphore_Wait(NP2_Semaphore_t* psem);
extern void NP2_Semaphore_Wait(NP2_Semaphore_t* psem);
/* for caller/callee */
void NP2_Semaphore_Release(NP2_Semaphore_t* psem);
extern void NP2_Semaphore_Release(NP2_Semaphore_t* psem);
/* --- wait queue --- */
@ -109,25 +107,25 @@ typedef union NP2_WaitQueue_t_ {
} NP2_WaitQueue_t;
/* for caller (ring) */
void NP2_WaitQueue_Ring_Create(NP2_WaitQueue_t* pque, unsigned int maxcount);
extern void NP2_WaitQueue_Ring_Create(NP2_WaitQueue_t* pque, unsigned int maxcount);
/* for caller (ringint) */
void NP2_WaitQueue_RingInt_Create(NP2_WaitQueue_t* pque, unsigned int maxcount);
extern void NP2_WaitQueue_RingInt_Create(NP2_WaitQueue_t* pque, unsigned int maxcount);
/* for caller (list) */
void NP2_WaitQueue_List_Create(NP2_WaitQueue_t* pque);
extern void NP2_WaitQueue_List_Create(NP2_WaitQueue_t* pque);
/* for caller (ring,ringint,list) */
void NP2_WaitQueue_Destroy(NP2_WaitQueue_t* pque);
extern void NP2_WaitQueue_Destroy(NP2_WaitQueue_t* pque);
/* for caller (ringint) */
void NP2_WaitQueue_RingInt_Append(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, const int param);
extern void NP2_WaitQueue_RingInt_Append(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, const int param);
/* for caller (ring,list) */
void NP2_WaitQueue_Append(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, void* param);
extern void NP2_WaitQueue_Append(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, void* param);
/* for callee (ringint) */
void NP2_WaitQueue_RingInt_Shift(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, int* param);
extern void NP2_WaitQueue_RingInt_Shift(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, int* param);
/* for callee (ring,list) */
void NP2_WaitQueue_Shift(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, void** param);
extern void NP2_WaitQueue_Shift(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, void** param);
/* for callee (ringint) */
void NP2_WaitQueue_RingInt_Shift_Wait(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, int* param);
extern void NP2_WaitQueue_RingInt_Shift_Wait(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, int* param);
/* for callee (ring,list) */
void NP2_WaitQueue_Shift_Wait(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, void** param);
extern void NP2_WaitQueue_Shift_Wait(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, void** param);
/* --- sleep ms --- */
@ -141,6 +139,11 @@ void NP2_WaitQueue_Shift_Wait(NP2_WaitQueue_t* pque, NP2_Semaphore_t* psem, void
#define NP2_Sleep_ms(ms) retro_sleep(ms);
#endif
#if !defined(_WINDOWS)
extern BOOL QueryPerformanceCounter(LARGE_INTEGER* count);
extern BOOL QueryPerformanceFrequency(LARGE_INTEGER* freq);
#endif
#ifdef __cplusplus
}
#endif

13
np2_tickcount.c
View File

@ -82,5 +82,18 @@ int64_t NP2_TickCount_GetCountFromInit(void) {
return NP2_TickCount_GetCount() - initcount;
}
#if !defined(_WINDOWS) && defined(SUPPORT_NP2_TICKCOUNT)
BOOL QueryPerformanceCounter(LARGE_INTEGER* count) {
int64_t icount = NP2_TickCount_GetCount();
COPY64(count, &icount);
return TRUE;
}
BOOL QueryPerformanceFrequency(LARGE_INTEGER* freq) {
int64_t ifreq = NP2_TickCount_GetFrequency();
COPY64(freq, &ifreq);
return TRUE;
}
#endif
#endif // SUPPORT_NP2_TICKCOUNT

7
np2_tickcount.h
View File

@ -4,7 +4,6 @@
#if defined(SUPPORT_NP2_TICKCOUNT)
#include "compiler.h"
#include <stdint.h>
#ifdef __cplusplus
extern "C" {
@ -12,9 +11,9 @@ extern "C" {
void NP2_TickCount_Initialize(void);
int64_t NP2_TickCount_GetCount(void);
int64_t NP2_TickCount_GetFrequency(void);
int64_t NP2_TickCount_GetCountFromInit(void);
extern int64_t NP2_TickCount_GetCount(void);
extern int64_t NP2_TickCount_GetFrequency(void);
extern int64_t NP2_TickCount_GetCountFromInit(void);
#ifdef __cplusplus
}

17
pccore.c
View File

@ -86,8 +86,11 @@
#define CPU_BRAND_ID_AUTO (0xffffffff)
#define CPU_EFLAGS_MASK (0)
#endif
#include "np2_tickcount.h"
#if defined(SUPPORT_IA32_HAXM)
#if !defined(SUPPORT_NP2_TICKCOUNT)
#error HAXM need NP2_TickCount
#endif
#include "np2_tickcount.h"
#include "i386hax/haxfunc.h"
#include "i386hax/haxcore.h"
#include "dmax86.h"
@ -1573,15 +1576,3 @@ int SetCpuTypeIndex(UINT index){
}
#endif
#if !defined(_WINDOWS) && !defined(__MINGW32__) && !defined(__CYGWIN__)
BOOL QueryPerformanceCounter(LARGE_INTEGER* count) {
int64_t icount = NP2_TickCount_GetCount();
COPY64(count, &icount);
return TRUE;
}
BOOL QueryPerformanceFrequency(LARGE_INTEGER* freq) {
int64_t ifreq = NP2_TickCount_GetFrequency();
COPY64(freq, &ifreq);
return TRUE;
}
#endif

21
sdl2/Makefile.common
View File

@ -15,7 +15,6 @@ INCFLAGS := -I$(NP2_PATH) \
-I$(NP2_PATH)/generic \
-I$(NP2_PATH)/io \
-I$(NP2_PATH)/mem \
-I$(NP2_PATH)/network \
-I$(NP2_PATH)/sound \
-I$(NP2_PATH)/sound/vermouth \
-I$(NP2_PATH)/sound/mame \
@ -29,8 +28,6 @@ SOURCES_C := $(NP2_PATH)/calendar.c \
$(NP2_PATH)/debugsub.c \
$(NP2_PATH)/keystat.c \
$(NP2_PATH)/nevent.c \
$(NP2_PATH)/np2_thread.c \
$(NP2_PATH)/np2_tickcount.c \
$(NP2_PATH)/pccore.c \
$(NP2_PATH)/statsave.c \
$(NP2_PATH)/timing.c \
@ -55,7 +52,6 @@ SOURCES_C := $(NP2_PATH)/calendar.c \
$(wildcard $(NP2_PATH)/io/pci/*.c) \
$(wildcard $(NP2_PATH)/lio/*.c) \
$(wildcard $(NP2_PATH)/mem/*.c) \
$(wildcard $(NP2_PATH)/network/*.c) \
$(wildcard $(NP2_PATH)/sdl2/*.c) \
$(wildcard $(NP2_PATH)/sound/*.c) \
$(wildcard $(NP2_PATH)/sound/getsnd/*.c) \
@ -72,3 +68,20 @@ NP2DEFINE := -DBIOS_IO_EMULATION -DOSLANG_UTF8 -DOSLINEBREAK_CRLF -DSOUND_CRITIC
NP21DEFINE := -DCPUCORE_IA32 -DIA32_PAGING_EACHSIZE -DIA32_REBOOT_ON_PANIC -DSUPPORT_CRT31KHZ -DSUPPORT_FPU_DOSBOX -DSUPPORT_FPU_DOSBOX2 -DSUPPORT_FPU_SOFTFLOAT -DSUPPORT_GAMEPORT -DSUPPORT_MEMDBG32 -DSUPPORT_LARGE_MEMORY -DSUPPORT_PC9801_119 -DSUPPORT_PC9821 -DSUPPORT_PCI -DSUPPORT_PEGC -DSUPPORT_SOUND_SB16 -DSUPPORT_VGA_MODEX -DUSE_3DNOW -DUSE_FASTPAGING -DUSE_FPU -DUSE_MMX -DUSE_SSE -DUSE_SSE2 -DUSE_SSE3 -DUSE_TSC -DUSE_VME
ifeq ($(SUPPORT_NP2_THREAD), 1)
SOURCES_C += $(NP2_PATH)/np2_thread.c
NP2DEFINES += -DSUPPORT_NP2_THREAD
endif
ifeq ($(SUPPORT_NP2_TICKCOUNT), 1)
SOURCES_C += $(NP2_PATH)/np2_tickcount.c
NP2DEFINES += -DSUPPORT_NP2_TICKCOUNT
endif
ifeq ($(SUPPORT_NET), 1)
INCFLAGS += -I$(NP2_PATH)/network
SOURCES_C += $(wildcard $(NP2_PATH)/network/*.c)
NP2DEFINES += -DSUPPORT_NET -DSUPPORT_LGY98
endif
ifeq ($(SUPPORT_ASYNC_CPU), 1)
NP2DEFINES += -DSUPPORT_ASYNC_CPU
endif

28
sdl2/Makefile.libretro
View File

@ -6,10 +6,11 @@ ENDIANNESS_DEFINES=
C_VER = -std=gnu99
CXX_VER =
SUPPORT_NP2_THREAD = 1
SUPPORT_NP2_TICKCOUNT = 1
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 0
SUPPORT_ASYNC_CPU ?= 1
SUPPORT_DIRENT = 1
SUPPORT_ASYNC_CPU = 1
SPACE :=
SPACE := $(SPACE) $(SPACE)
@ -844,8 +845,8 @@ SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/compat/compat_strcasestr
$(NP2_PATH)/sdl2/libretro/libretro-common/string/stdstring.c
ifeq ($(SUPPORT_NP2_THREAD), 1)
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/rthreads/rthreads.c
SOURCES_C += $(NP2_PATH)/sdl2/libretro/rsemaphore.c
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/rthreads/rthreads.c \
$(NP2_PATH)/sdl2/libretro/rsemaphore.c
endif
ifeq ($(SUPPORT_DIRENT), 1)
ifneq (,$(findstring uwp,$(platform)))
@ -855,7 +856,6 @@ SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/compat/compat_strcasestr
endif
endif
ifeq ($(platform), unix)
# SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/compat/compat_ifaddrs.c
SOURCES_C += $(NP2_PATH)/sdl2/libretro/libretro-common/file/nbio/nbio_linux.c
endif
endif
@ -869,13 +869,6 @@ endif
OBJECTS = $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)
ifeq ($(platform), unix)
ifeq ($(SUPPORT_NET), 1)
CXXFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98
CFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98
endif
endif
ifeq ($(HAS_GCC), 1)
CFLAGS += -fsigned-char
CXXFLAGS += -fno-rtti
@ -895,15 +888,6 @@ ifeq ($(HAS_GCC), 1)
endif
DEFINES += -D__LIBRETRO__ $(PLATFORM_DEFINES) $(GCC_WARNINGS) $(COMMONFLAGS) $(GCC_SECURITY_FLAGS) -DNST_NO_ZLIB $(INCFLAGS) $(INCFLAGS_PLATFORM) $(NP2DEFINE) $(NP21DEFINE)
ifeq ($(SUPPORT_NP2_THREAD), 1)
DEFINES += -DSUPPORT_NP2_THREAD
endif
ifeq ($(SUPPORT_NP2_TICKCOUNT), 1)
DEFINES += -DSUPPORT_NP2_TICKCOUNT
endif
ifeq ($(SUPPORT_ASYNC_CPU), 1)
DEFINES += -DSUPPORT_ASYNC_CPU
endif
CFLAGS += $(fpic) $(DEFINES) $(C_VER) $(ENDIANNESS_DEFINES)
CXXFLAGS += $(fpic) $(DEFINES) $(CXX_VER) $(ENDIANNESS_DEFINES)

4
sdl2/Makefile.mac
View File

@ -1,4 +1,8 @@
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SDL_VERSION ?= 2
GIT_VERSION := "$(shell git rev-parse --short HEAD)"

13
sdl2/Makefile.opendingux
View File

@ -5,7 +5,10 @@ AR=/opt/$(ODCONFIG)-toolchain/usr/bin/mipsel-linux-ar
CXX=/opt/$(ODCONFIG)-toolchain/usr/bin/mipsel-linux-g++
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SDL_VERSION ?= 1
GIT_VERSION := "$(shell git rev-parse --short HEAD)"
@ -60,11 +63,6 @@ SOURCES_C += $(NP2_PATH)/sdl2/opendingux/main.c
INCFLAGS += -I$(NP2_PATH)/i286c
SOURCES_C += $(wildcard $(NP2_PATH)/i286c/*.c)
ifeq ($(SUPPORT_NET), 1)
CXXFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98 -L/opt/$(ODCONFIG)-toolchain/usr/lib
CFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98
endif
NP2SDLDEFINE := -DNP2_SDL2 -DUSE_SDLAUDIO -DUSE_SDLMIXER
OBJECTS = $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)
@ -72,11 +70,6 @@ CXXFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) -D__OPENDINGUX__ $(N
CFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) -D__OPENDINGUX__ $(NP2SDLDEFINE) -DSUPPORT_NP2_TICKCOUNT -DSUPPORT_NP2_THREAD -std=gnu11
LDFLAGS += $(fpic) -lm -lpthread $(SDL_LIBS) $(SDL_OTHER_LIBS) -L/opt/$(ODCONFIG)-toolchain/usr/lib
ifeq ($(SUPPORT_NET), 1)
CXXFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98 -L/opt/$(ODCONFIG)-toolchain/usr/lib
CFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98
endif
all: buildopk
$(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)

4
sdl2/Makefile.unix
View File

@ -1,4 +1,8 @@
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SDL_VERSION ?= 2
GIT_VERSION := "$(shell git rev-parse --short HEAD)"

4
sdl2/Makefile.win
View File

@ -1,4 +1,8 @@
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SDL_VERSION ?= 2
GIT_VERSION := "$(shell git rev-parse --short HEAD)"

17
sdl2/Makefile21.mac
View File

@ -1,4 +1,8 @@
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SUPPORT_HAXM ?= 0
SDL_VERSION ?= 2
GIT_VERSION := "$(shell git rev-parse --short HEAD)"
@ -65,18 +69,17 @@ SOURCES_C += $(wildcard $(NP2_PATH)/i386c/*.c) \
NP2SDLDEFINE := -DNP2_SDL2 -DUSE_SDLAUDIO -DUSE_SDLMIXER -DSUPPORT_NVL_IMAGES -DSUPPORT_NP2_THREAD -DSUPPORT_NVL_IMAGES -DSUPPORT_LGY98 -DSUPPORT_NET $(SUPPORT_ASYNC_CPU) -DSUPPORT_NP2_TICKCOUNT
ifeq ($(SUPPORT_HAXM), 1)
INCFLAGS += -I$(NP2_PATH)/i386hax
SOURCES_C += $(wildcard $(NP2_PATH)/i386hax/*.c)
DEFINES += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
endif
OBJECTS = $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)
CXXFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) $(NP2SDLDEFINE)
CFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) $(NP2SDLDEFINE)
LDFLAGS += $(fpic) -lm -lpthread $(SDL_LIBS) $(SDL_OTHER_LIBS)
ifeq ($(SUPPORT_HAXM), 1)
INCFLAGS += -I$(NP2_PATH)/i386hax
SOURCES_C += $(wildcard $(NP2_PATH)/i386hax/*.c)
CXXFLAGS += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
CFLAGS += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
endif
all: $(TARGET)
$(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)

8
sdl2/Makefile21.opendingux
View File

@ -5,7 +5,10 @@ AR=/opt/$(ODCONFIG)-toolchain/usr/bin/mipsel-linux-ar
CXX=/opt/$(ODCONFIG)-toolchain/usr/bin/mipsel-linux-g++
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SDL_VERSION ?= 1
GIT_VERSION := "$(shell git rev-parse --short HEAD)"
@ -89,11 +92,6 @@ CXXFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) -D__OP
CFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) -D__OPENDINGUX__ $(NP2SDLDEFINE) -DSUPPORT_NP2_TICKCOUNT -DSUPPORT_NP2_THREAD -std=gnu11
LDFLAGS += $(fpic) -lm -lpthread $(SDL_LIBS) $(SDL_OTHER_LIBS) -L/opt/$(ODCONFIG)-toolchain/usr/lib
ifeq ($(SUPPORT_NET), 1)
CXXFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98 -L/opt/$(ODCONFIG)-toolchain/usr/lib
CFLAGS += -DSUPPORT_NET -DSUPPORT_LGY98
endif
all: buildopk
$(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)

17
sdl2/Makefile21.unix
View File

@ -1,4 +1,8 @@
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SUPPORT_HAXM ?= 0
SDL_VERSION ?= 2
GIT_VERSION := "$(shell git rev-parse --short HEAD)"
@ -65,18 +69,17 @@ SOURCES_C += $(wildcard $(NP2_PATH)/i386c/*.c) \
NP2SDLDEFINE := -DNP2_SDL2 -DUSE_SDLAUDIO -DUSE_SDLMIXER -DSUPPORT_NVL_IMAGES -DSUPPORT_NP2_THREAD -DSUPPORT_NVL_IMAGES -DSUPPORT_LGY98 -DSUPPORT_NET $(SUPPORT_ASYNC_CPU) -DSUPPORT_NP2_TICKCOUNT
ifeq ($(SUPPORT_HAXM), 1)
INCFLAGS += -I$(NP2_PATH)/i386hax
SOURCES_C += $(wildcard $(NP2_PATH)/i386hax/*.c)
DEFINES += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
endif
OBJECTS = $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)
CXXFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) $(NP2SDLDEFINE)
CFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) $(NP2SDLDEFINE)
LDFLAGS += $(fpic) -lm -lpthread $(SDL_LIBS) $(SDL_OTHER_LIBS) -ldl
ifeq ($(SUPPORT_HAXM), 1)
INCFLAGS += -I$(NP2_PATH)/i386hax
SOURCES_C += $(wildcard $(NP2_PATH)/i386hax/*.c)
CXXFLAGS += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
CFLAGS += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
endif
all: $(TARGET)
$(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)

17
sdl2/Makefile21.win
View File

@ -1,4 +1,8 @@
DEBUG ?= 0
SUPPORT_NP2_THREAD ?= 1
SUPPORT_NP2_TICKCOUNT ?= 1
SUPPORT_NET ?= 1
SUPPORT_ASYNC_CPU ?= 0
SUPPORT_HAXM ?= 0
SDL_VERSION ?= 2
GIT_VERSION := "$(shell git rev-parse --short HEAD)"
@ -67,18 +71,17 @@ SOURCES_C += $(wildcard $(NP2_PATH)/i386c/*.c) \
NP2SDLDEFINE := -DNP2_SDL2 -DUSE_SDLAUDIO -DUSE_SDLMIXER -DSUPPORT_NVL_IMAGES -DSUPPORT_NP2_THREAD -DSUPPORT_NVL_IMAGES -DSUPPORT_LGY98 -DSUPPORT_NET $(SUPPORT_ASYNC_CPU) -DSUPPORT_NP2_TICKCOUNT
ifeq ($(SUPPORT_HAXM), 1)
INCFLAGS += -I$(NP2_PATH)/i386hax
SOURCES_C += $(wildcard $(NP2_PATH)/i386hax/*.c)
DEFINES += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
endif
OBJECTS = $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)
CXXFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) $(NP2SDLDEFINE)
CFLAGS += $(fpic) $(INCFLAGS) $(COMMONFLAGS) $(NP2DEFINE) $(NP21DEFINE) $(NP2SDLDEFINE)
LDFLAGS += $(fpic) -lm $(SDL_LIBS) $(SDL_OTHER_LIBS) -lwinmm
ifeq ($(SUPPORT_HAXM), 1)
INCFLAGS += -I$(NP2_PATH)/i386hax
SOURCES_C += $(wildcard $(NP2_PATH)/i386hax/*.c)
CXXFLAGS += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
CFLAGS += -DSUPPORT_IA32_HAXM -DUSE_CUSTOM_HOOKINST
endif
all: $(TARGET)
$(TARGET): $(OBJECTS)
ifeq ($(STATIC_LINKING), 1)