mirror of
https://github.com/Ed94/VEFontCache-Odin.git
synced 2025-08-05 14:42:42 -07:00
progress on compiling within wsl linux
This commit is contained in:
@@ -84,7 +84,7 @@ popd > /dev/null
|
|||||||
path_stb_truetype="$path_thirdparty/stb/src"
|
path_stb_truetype="$path_thirdparty/stb/src"
|
||||||
|
|
||||||
pushd "$path_stb_truetype" > /dev/null
|
pushd "$path_stb_truetype" > /dev/null
|
||||||
eval make -C "$path_stb_truetype"
|
make
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
|
|
||||||
source "$(dirname "$0")/helpers/odin_compiler_defs.sh"
|
source "$(dirname "$0")/helpers/odin_compiler_defs.sh"
|
||||||
|
BIN
thirdparty/stb/lib/stb_truetype.a
vendored
Normal file
BIN
thirdparty/stb/lib/stb_truetype.a
vendored
Normal file
Binary file not shown.
10
thirdparty/stb/src/Makefile
vendored
10
thirdparty/stb/src/Makefile
vendored
@@ -6,6 +6,8 @@ else
|
|||||||
all: unix
|
all: unix
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
$(info Current OS is: $(OS))
|
||||||
|
|
||||||
wasm:
|
wasm:
|
||||||
mkdir -p ../lib
|
mkdir -p ../lib
|
||||||
$(CC) -c -Os --target=wasm32 --sysroot=$(shell odin root)/vendor/libc stb_truetype.c -o ../lib/stb_truetype_wasm.o
|
$(CC) -c -Os --target=wasm32 --sysroot=$(shell odin root)/vendor/libc stb_truetype.c -o ../lib/stb_truetype_wasm.o
|
||||||
@@ -13,15 +15,13 @@ wasm:
|
|||||||
unix:
|
unix:
|
||||||
mkdir -p ../lib
|
mkdir -p ../lib
|
||||||
$(CC) -c -O2 -Os -fPIC stb_truetype.c
|
$(CC) -c -O2 -Os -fPIC stb_truetype.c
|
||||||
$(AR) rcs ../lib/stb_truetype.a stb_truetype.o
|
$(AR) rcs ../lib/stb_truetype.a stb_truetype.o
|
||||||
|
#$(CC) -fPIC -shared -Wl,-soname=stb_truetype.so -o ../lib/stb_truetype.so stb_image_truetype.o
|
||||||
#$(CC) -fPIC -shared -Wl,-soname=stb_truetype.so -o ../lib/stb_truetype.so stb_image_truetype.o
|
|
||||||
rm *.o
|
rm *.o
|
||||||
|
|
||||||
darwin:
|
darwin:
|
||||||
mkdir -p ../lib
|
mkdir -p ../lib
|
||||||
lipo -create stb_truetype-x86_64.o stb_truetype-arm64.o -output ../lib/darwin/stb_truetype.a
|
|
||||||
$(CC) -arch x86_64 -c -O2 -Os -fPIC stb_truetype.c -o stb_truetype-x86_64.o -mmacosx-version-min=10.12
|
$(CC) -arch x86_64 -c -O2 -Os -fPIC stb_truetype.c -o stb_truetype-x86_64.o -mmacosx-version-min=10.12
|
||||||
$(CC) -arch arm64 -c -O2 -Os -fPIC stb_truetype.c -o stb_truetype-arm64.o -mmacosx-version-min=10.12
|
$(CC) -arch arm64 -c -O2 -Os -fPIC stb_truetype.c -o stb_truetype-arm64.o -mmacosx-version-min=10.12
|
||||||
|
lipo -create stb_truetype-x86_64.o stb_truetype-arm64.o -output ../lib/darwin/stb_truetype.a
|
||||||
rm *.o
|
rm *.o
|
||||||
|
9
thirdparty/stb/src/gb/gb.h
vendored
9
thirdparty/stb/src/gb/gb.h
vendored
@@ -537,6 +537,8 @@ typedef i32 b32; // NOTE(bill): Prefer this!!!
|
|||||||
#else
|
#else
|
||||||
#define gb_inline __forceinline
|
#define gb_inline __forceinline
|
||||||
#endif
|
#endif
|
||||||
|
#elif (__GNUC__)
|
||||||
|
#define gb_inline inline
|
||||||
#else
|
#else
|
||||||
#define gb_inline __attribute__ ((__always_inline__))
|
#define gb_inline __attribute__ ((__always_inline__))
|
||||||
#endif
|
#endif
|
||||||
@@ -964,11 +966,12 @@ gb_mutex_init(&m);
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
typedef struct gbThread gbThread;
|
||||||
|
|
||||||
#define GB_THREAD_PROC(name) isize name(struct gbThread *thread)
|
#define GB_THREAD_PROC(name) isize name(gbThread *thread)
|
||||||
typedef GB_THREAD_PROC(gbThreadProc);
|
typedef GB_THREAD_PROC(gbThreadProc);
|
||||||
|
|
||||||
typedef struct gbThread {
|
struct gbThread {
|
||||||
#if defined(GB_SYSTEM_WINDOWS)
|
#if defined(GB_SYSTEM_WINDOWS)
|
||||||
void * win32_handle;
|
void * win32_handle;
|
||||||
#else
|
#else
|
||||||
@@ -983,7 +986,7 @@ typedef struct gbThread {
|
|||||||
gbSemaphore semaphore;
|
gbSemaphore semaphore;
|
||||||
isize stack_size;
|
isize stack_size;
|
||||||
b32 volatile is_running;
|
b32 volatile is_running;
|
||||||
} gbThread;
|
};
|
||||||
|
|
||||||
GB_DEF void gb_thread_init (gbThread *t);
|
GB_DEF void gb_thread_init (gbThread *t);
|
||||||
GB_DEF void gb_thread_destroy (gbThread *t);
|
GB_DEF void gb_thread_destroy (gbThread *t);
|
||||||
|
Reference in New Issue
Block a user