Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

some fixes #873

Merged
merged 2 commits into from
Dec 6, 2024
Merged

some fixes #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9addbbd
arm_jit: fix build when LOG_JIT_LEVEL != 0
rofl0r Dec 6, 2024
f239227
fix couple of header names to work on case-sensitive file systems
rofl0r Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions desmume/src/arm_jit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
using namespace AsmJit;

#if (LOG_JIT_LEVEL > 0)
#include "../modules/Disassembler.h"
#define LOG_JIT 1
#define JIT_COMMENT(...) c.comment(__VA_ARGS__)
#define printJIT(buf, val) { \
Expand Down
4 changes: 2 additions & 2 deletions desmume/src/frontend/windows/aviout.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <Commdlg.h>
#include <Shellapi.h>
#include <commdlg.h>
#include <shellapi.h>

#include <vfw.h>

Expand Down
4 changes: 2 additions & 2 deletions desmume/src/frontend/windows/display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ along with the this software. If not, see <http://www.gnu.org/licenses/>.

#include "display.h"

#include <MMSystem.h>
#include <WindowsX.h>
#include <mmsystem.h>
#include <windowsx.h>

#include "main.h"
#include "windriver.h"
Expand Down
6 changes: 3 additions & 3 deletions desmume/src/frontend/windows/hotkey.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <Commdlg.h>
#include <Shellapi.h>
#include <commdlg.h>
#include <shellapi.h>

#include "hotkey.h"

Expand All @@ -39,7 +39,7 @@
#include "frontend/modules/ImageOut.h"

#include "main.h"
#include "CheatsWin.h"
#include "cheatsWin.h"
#include "inputdx.h"
#include "throttle.h"
#include "ramwatch.h" //In order to call UpdateRamWatch (for loadstate functions)
Expand Down
4 changes: 2 additions & 2 deletions desmume/src/frontend/windows/inputdx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
#define INPUTDX_INCLUDED

#include <windows.h>
#include <Mmsystem.h>
#include <mmsystem.h>
#define DIRECTINPUT_VERSION 0x0800
#include "directx/dinput.h"
#include "directx/xinput.h"
#include "directx/XInput.h"

typedef struct
{
Expand Down
4 changes: 2 additions & 2 deletions desmume/src/frontend/windows/luaconsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <algorithm>
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <Commdlg.h>
#include <Shellapi.h>
#include <commdlg.h>
#include <shellapi.h>
#include "driver.h"
#include "lua-engine.h"

Expand Down
10 changes: 5 additions & 5 deletions desmume/src/frontend/windows/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include <string>
#include <vector>

#include <Winuser.h>
#include <Winnls.h>
#include <winuser.h>
#include <winnls.h>
#include <windowsx.h>
#include <mmsystem.h>
#include <shellapi.h>
Expand Down Expand Up @@ -100,9 +100,9 @@
#include "palView.h"
#include "tileView.h"
#include "oamView.h"
#include "mapview.h"
#include "matrixview.h"
#include "lightview.h"
#include "mapView.h"
#include "matrixView.h"
#include "lightView.h"
#include "slot1_config.h"
#include "gbaslot_config.h"
#include "cheatsWin.h"
Expand Down
2 changes: 1 addition & 1 deletion desmume/src/frontend/windows/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define _MAIN_H_

#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#include <windows.h>
#include "types.h"
#include "CWindow.h"

Expand Down
4 changes: 2 additions & 2 deletions desmume/src/frontend/windows/ogl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

#include "OGLRender.h"

#include <gl/gl.h>
#include <gl/glext.h>
#include <GL/gl.h>
#include <GL/glext.h>
#include <GL/wglext.h>
#include "console.h"
#include "CWindow.h"
Expand Down
2 changes: 1 addition & 1 deletion desmume/src/frontend/windows/ram_search.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include "cheatsWin.h"

#ifdef _WIN32
#include "BaseTsd.h"
#include "basetsd.h"
typedef INT_PTR intptr_t;
#else
#include "stdint.h"
Expand Down
2 changes: 1 addition & 1 deletion desmume/src/frontend/windows/snddx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "snddx.h"

#include <stdio.h>
#include <Windows.h>
#include <windows.h>
#include <mmsystem.h>
#include "directx/dsound.h"

Expand Down
4 changes: 2 additions & 2 deletions desmume/src/frontend/windows/throttle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <Commdlg.h>
#include <Shellapi.h>
#include <commdlg.h>
#include <shellapi.h>

#include "types.h"
#include "debug.h"
Expand Down
4 changes: 2 additions & 2 deletions desmume/src/frontend/windows/winutil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <string.h>
#include <windows.h>
#include <windef.h>
#include <ShlObj.h>
#include <shlobj.h>


char IniName[MAX_PATH];
Expand Down Expand Up @@ -200,4 +200,4 @@ int GetSubMenuIndexByHMENU(HMENU menu, HMENU sub)
if(sub == trial) return i;
}
return -1;
}
}
2 changes: 1 addition & 1 deletion desmume/src/lua-engine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <windows.h>
#if defined(WIN32_FRONTEND)
#include <direct.h>
#include <MMSystem.h>
#include <mmsystem.h>

typedef HMENU PlatformMenu; // hMenu
#define MAX_MENU_COUNT (IDC_LUAMENU_RESERVE_END - IDC_LUAMENU_RESERVE_START + 1)
Expand Down
2 changes: 1 addition & 1 deletion desmume/src/utils/AsmJit/core/build.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ static inline T asmjit_cast(Z* p) { return (T)p; }
// ============================================================================

#if defined(ASMJIT_WINDOWS)
#include <Windows.h>
#include <windows.h>
#endif // ASMJIT_WINDOWS

#if defined(__APPLE__)
Expand Down