Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Commit

Permalink
log: move to libtrx
Browse files Browse the repository at this point in the history
  • Loading branch information
rr- committed Apr 29, 2024
1 parent 3ec3ba7 commit bba944c
Show file tree
Hide file tree
Showing 13 changed files with 12 additions and 84 deletions.
1 change: 0 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ dll_sources = [
'src/inject_exec.c',
'src/inject_util.c',
'src/lib/winmm.c',
'src/log.c',
'src/main_dll.c',
'src/specific/s_audio_sample.c',
'src/specific/s_filesystem.c',
Expand Down
2 changes: 1 addition & 1 deletion src/filesystem.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "filesystem.h"

#include "log.h"
#include "shared/log.h"
#include "shared/memory.h"
#include "specific/s_filesystem.h"

Expand Down
2 changes: 1 addition & 1 deletion src/game/console.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "game/text.h"
#include "global/const.h"
#include "global/types.h"
#include "log.h"
#include "shared/log.h"
#include "util.h"

#include <stdarg.h>
Expand Down
2 changes: 1 addition & 1 deletion src/game/music.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "game/music.h"

#include "log.h"
#include "shared/log.h"
#include "specific/s_music.h"
#include "specific/s_music_mm.h"
#include "specific/s_music_pauld.h"
Expand Down
2 changes: 1 addition & 1 deletion src/inject_util.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "inject_util.h"

#include "log.h"
#include "shared/log.h"

#include <windows.h>

Expand Down
62 changes: 0 additions & 62 deletions src/log.c

This file was deleted.

10 changes: 0 additions & 10 deletions src/log.h

This file was deleted.

5 changes: 3 additions & 2 deletions src/main_dll.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "filesystem.h"
#include "inject_exec.h"
#include "lib/winmm.h"
#include "log.h"
#include "shared/log.h"

#include <stdio.h>
#include <windows.h>
Expand All @@ -10,7 +11,7 @@ DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
{
switch (ul_reason_for_call) {
case DLL_PROCESS_ATTACH:
Log_Init();
Log_Init(File_GetFullPath("TR2X.log"));
LOG_DEBUG("Injected\n");

WinMM_Load();
Expand Down
2 changes: 1 addition & 1 deletion src/specific/s_audio_sample.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "global/funcs.h"
#include "global/vars.h"
#include "lib/dsound.h"
#include "log.h"
#include "shared/log.h"
#include "specific/s_flagged_string.h"

const SOUND_ADAPTER_NODE *__cdecl S_Audio_Sample_GetAdapter(const GUID *guid)
Expand Down
2 changes: 1 addition & 1 deletion src/specific/s_filesystem.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "specific/s_filesystem.h"

#include "log.h"
#include "shared/log.h"
#include "shared/memory.h"

#include <assert.h>
Expand Down
2 changes: 1 addition & 1 deletion src/specific/s_music_mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "global/funcs.h"
#include "global/vars.h"
#include "lib/winmm.h"
#include "log.h"
#include "shared/log.h"

static bool __cdecl S_Music_MM_Init(void);
static void __cdecl S_Music_MM_Shutdown(void);
Expand Down
2 changes: 1 addition & 1 deletion src/specific/s_music_pauld.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "global/types.h"
#include "global/vars.h"
#include "lib/winmm.h"
#include "log.h"
#include "shared/log.h"

#include <inttypes.h>
#include <stdarg.h>
Expand Down
2 changes: 1 addition & 1 deletion subprojects/libtrx

0 comments on commit bba944c

Please sign in to comment.