mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-01-03 21:52:40 +00:00
Merge win32/win_dll.c
This commit is contained in:
parent
7ad5057fe9
commit
5271db81b7
1 changed files with 0 additions and 4 deletions
|
|
@ -86,9 +86,6 @@ static VOID UnloadDLL (HMODULE* pModule)
|
|||
// ==========================================================================
|
||||
|
||||
// note : the 3D driver loading should be put somewhere else..
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
#ifdef HWRENDER
|
||||
static HMODULE hwdModule = NULL;
|
||||
|
||||
|
|
@ -173,7 +170,6 @@ VOID Shutdown3DDriver (VOID)
|
|||
}
|
||||
#endif
|
||||
|
||||
>>>>>>> srb2/next
|
||||
#ifdef HW3SOUND
|
||||
static HMODULE hwsModule = NULL;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue