Browse Source

Cleanup ysfx setup

Signed-off-by: falkTX <falktx@falktx.com>
tags/v2.5.1
falkTX 2 years ago
parent
commit
d87b2f47b0
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 17 additions and 19 deletions
  1. +13
    -19
      source/modules/ysfx/Makefile
  2. +4
    -0
      source/modules/ysfx/thirdparty/WDL/source/WDL/eel2/eel_misc.h

+ 13
- 19
source/modules/ysfx/Makefile View File

@@ -22,35 +22,23 @@ YSFX_FLAGS += -DYSFX_API=
YSFX_FLAGS += -DYSFX_NO_STANDARD_MUTEX YSFX_FLAGS += -DYSFX_NO_STANDARD_MUTEX


# FIXME so many warnings.. # FIXME so many warnings..
YSFX_FLAGS += -Wno-missing-field-initializers
# YSFX_FLAGS += -Wno-missing-field-initializers
YSFX_FLAGS += -Wno-sign-compare YSFX_FLAGS += -Wno-sign-compare
YSFX_FLAGS += -Wno-unused-function YSFX_FLAGS += -Wno-unused-function
YSFX_FLAGS += -Wno-unused-parameter YSFX_FLAGS += -Wno-unused-parameter


ifeq ($(CPU_ARM),true)
ifneq ($(CPU_ARM64),true)
# optimized assembly code for armhf does not run properly yet
YSFX_FLAGS += -DEEL_TARGET_PORTABLE
endif
ifeq ($(CPU_I386_OR_X86_64),true)
YSFX_NATIVELY_OPTIMIZED = true
else ifeq ($(CPU_ARM64),true)
YSFX_NATIVELY_OPTIMIZED = true
endif endif


ifeq ($(YSFX_FTS_LACKS_LFS_SUPPORT),true) ifeq ($(YSFX_FTS_LACKS_LFS_SUPPORT),true)
YSFX_FLAGS += -DYSFX_FTS_LACKS_LFS_SUPPORT YSFX_FLAGS += -DYSFX_FTS_LACKS_LFS_SUPPORT
endif endif


ifneq ($(HAIKU),true)
ifneq ($(WASM),true)
YSFX_FLAGS += -pthread
endif
endif

ifeq ($(CPU_RISCV64),true)
# FIXME
YSFX_FLAGS += -DEEL_TARGET_PORTABLE
endif

ifeq ($(WASM),true)
# FIXME
ifneq ($(YSFX_NATIVELY_OPTIMIZED),true)
# missing optimized assembly code or not running properly yet, use portable slower approach
YSFX_FLAGS += -DEEL_TARGET_PORTABLE YSFX_FLAGS += -DEEL_TARGET_PORTABLE
endif endif


@@ -69,6 +57,12 @@ else
YSFX_FLAGS += -DYSFX_NO_GFX YSFX_FLAGS += -DYSFX_NO_GFX
endif endif


ifneq ($(HAIKU),true)
ifneq ($(WASM),true)
YSFX_FLAGS += -pthread
endif
endif

BUILD_C_FLAGS += $(YSFX_FLAGS) BUILD_C_FLAGS += $(YSFX_FLAGS)
BUILD_CXX_FLAGS += $(YSFX_FLAGS) BUILD_CXX_FLAGS += $(YSFX_FLAGS)




+ 4
- 0
source/modules/ysfx/thirdparty/WDL/source/WDL/eel2/eel_misc.h View File

@@ -39,8 +39,12 @@ static EEL_F * NSEEL_CGEN_CALL _eel_time_precise(void *opaque, EEL_F *v)
QueryPerformanceCounter(&now); QueryPerformanceCounter(&now);
*v = (double)now.QuadPart / (double)freq.QuadPart; *v = (double)now.QuadPart / (double)freq.QuadPart;
// *v = (EEL_F)timeGetTime() * 0.001; // *v = (EEL_F)timeGetTime() * 0.001;
#else
#ifdef __cplusplus
struct timeval tm={};
#else #else
struct timeval tm={0,}; struct timeval tm={0,};
#endif
gettimeofday(&tm,NULL); gettimeofday(&tm,NULL);
*v = tm.tv_sec + tm.tv_usec*0.000001; *v = tm.tv_sec + tm.tv_usec*0.000001;
#endif #endif


Loading…
Cancel
Save