mirror of
https://github.com/zeldaret/oot
synced 2026-08-21 22:40:55 -04:00
Move build.c definitions to the makefile, introduce and use libultra version defines in libultra instead of PLATFORM defines (#2353)
* Move build.c definitions to the makefile, introduce and use libultra version defines in libultra instead of PLATFORM defines * MAJOR+MINOR versions -> VERSION+PATCH, stringify build defines in makefile, let the libultra version determine the OPTFLAGS for libultra files * Clang format moment * Remove LIBULTRA_VERSION_ID, tweak OS_VERSION and libultra version definitions * Better fix for formatting problems
This commit is contained in:
+2
-1
@@ -31,6 +31,7 @@
|
||||
#include "ultra64/motor.h"
|
||||
#include "ultra64/R4300.h"
|
||||
#include "ultra64/ucode.h"
|
||||
#include "ultra64/version.h"
|
||||
|
||||
union uObjBg;
|
||||
|
||||
@@ -42,7 +43,7 @@ void osStopThread(OSThread* thread);
|
||||
void osViExtendVStart(u32 value);
|
||||
s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flag);
|
||||
|
||||
#if PLATFORM_N64
|
||||
#if LIBULTRA_VERSION < LIBULTRA_VERSION_K
|
||||
void osInitialize(void);
|
||||
#else
|
||||
#define osInitialize() \
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
#ifndef ULTRA64_VERSION_H
|
||||
#define ULTRA64_VERSION_H
|
||||
|
||||
#define LIBULTRA_VERSION_D 'D'
|
||||
#define LIBULTRA_VERSION_E 'E'
|
||||
#define LIBULTRA_VERSION_F 'F'
|
||||
#define LIBULTRA_VERSION_G 'G'
|
||||
#define LIBULTRA_VERSION_H 'H'
|
||||
#define LIBULTRA_VERSION_I 'I'
|
||||
#define LIBULTRA_VERSION_J 'J'
|
||||
#define LIBULTRA_VERSION_K 'K'
|
||||
#define LIBULTRA_VERSION_L 'L'
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user