Fix directx compile, disable loading screen for directx
This commit is contained in:
parent
78df9826dc
commit
70c5e3e530
|
@ -20,6 +20,9 @@
|
|||
#endif
|
||||
#include <PR/gbi.h>
|
||||
|
||||
#define DECLARE_GFX_DXGI_FUNCTIONS
|
||||
#include "gfx_dxgi.h"
|
||||
|
||||
#include "../configfile.h"
|
||||
#include "../pc_main.h"
|
||||
|
||||
|
@ -38,9 +41,6 @@ extern "C" {
|
|||
|
||||
#define WINCLASS_NAME L"N64GAME"
|
||||
|
||||
#define DECLARE_GFX_DXGI_FUNCTIONS
|
||||
#include "gfx_dxgi.h"
|
||||
|
||||
#ifdef VERSION_EU
|
||||
#define FRAME_INTERVAL_US_NUMERATOR 40000
|
||||
#define FRAME_INTERVAL_US_DENOMINATOR 2
|
||||
|
|
|
@ -343,11 +343,15 @@ int main(int argc, char *argv[]) {
|
|||
}
|
||||
|
||||
// Start the thread for setting up the game
|
||||
#ifndef WAPI_DXGI
|
||||
if (pthread_mutex_init(&gLoadingThreadMutex, NULL) == 0 && pthread_create(&gLoadingThreadId, NULL, main_game_init, (void*) 1) == 0) {
|
||||
gIsThreaded = true;
|
||||
render_loading_screen(); // Render the loading screen while the game is setup
|
||||
gIsThreaded = false;
|
||||
} else {
|
||||
#else
|
||||
{
|
||||
#endif
|
||||
main_game_init(NULL); // Failsafe incase threading doesn't work
|
||||
}
|
||||
pthread_mutex_destroy(&gLoadingThreadMutex);
|
||||
|
|
Loading…
Reference in New Issue