joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 03:41:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Excluded some code for OS/2

Browse Source
This commit is contained in:
Jochen Sch„fer 2025-04-01 08:13:26 +02:00
parent d6f2be9be6
commit 97200d5744
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/sdlmain.cpp
View File

@ -35,6 +35,7 @@
#ifdef OS2
# define INCL_DOS
# define INCL_WIN
# define INCL_DOSERRORS
#endif
#if defined(WIN32)
@ -135,7 +136,7 @@ bool kana_input = false; // true if a half-width kana was typed
#include "../dos/drives.h"
#include "../ints/int10.h"
#if !defined(HX_DOS)
#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#if !defined(OS2) && !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#include "whereami.c"
#endif
#include "../libs/tinyfiledialogs/tinyfiledialogs.h"
@ -218,6 +219,11 @@ typedef enum PROCESS_DPI_AWARENESS {
# endif
#endif // WIN32
#ifdef OS2
# include <os2.h>
#endif
#include <sstream>
#include "mapper.h"
@ -239,7 +245,7 @@ extern "C" void sdl1_hax_macosx_highdpi_set_enable(const bool enable);
#endif
# include "SDL_version.h"
#if !defined(C_SDL2) && !defined(RISCOS)
#if !defined(C_SDL2) && !defined(RISCOS) && !defined(OS2)
# ifndef SDL_DOSBOX_X_SPECIAL
# warning It is STRONGLY RECOMMENDED to compile the DOSBox-X code using the SDL 1.x library provided in this source repository.
# error You can ignore this by commenting out this error, but you will encounter problems if you use the unmodified SDL 1.x library.
@ -442,6 +448,19 @@ std::string GetDOSBoxXPath(bool withexe=false) {
char exepath[MAX_PATH];
GetModuleFileName(NULL, exepath, sizeof(exepath));
full=std::string(exepath);
#elif defined(OS2) /* No WAI */
char exepath[CCHMAXPATH];
PPIB pib;
APIRET rc;
full = std::string("");
rc = DosGetInfoBlocks(NULL, &pib);
if (rc == NO_ERROR) {
rc = DosQueryModuleName(pib->pib_hmte, CCHMAXPATH, (PCHAR)&exepath);
if (rc == NO_ERROR) {
full = std::string(exepath);
}
}
#else
int length = wai_getExecutablePath(NULL, 0, NULL);
char *exepath = (char*)malloc(length + 1);
@ -897,10 +916,6 @@ const char *modifier;
# define PRIO_TOTAL (PRIO_MAX-PRIO_MIN)
#endif
#ifdef OS2
# include <os2.h>
#endif
#if defined(WIN32)
HWND GetHWND(void) {
SDL_SysWMinfo wmi;

8
src/hardware/serialport/misc_util.cpp
View File

@ -26,7 +26,7 @@
/*****************************************************************************/
// C++ SDLnet wrapper
#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#if !defined(OS2) && !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#define ENET_IMPLEMENTATION
#include "enet.h"
#endif
@ -86,7 +86,7 @@ NETClientSocket *NETClientSocket::NETClientFactory(SocketTypesE socketType,
switch (socketType) {
case SOCKET_TYPE_TCP: return new TCPClientSocket(destination, port);
#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#if !defined(OS2) && !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
case SOCKET_TYPE_ENET: return new ENETClientSocket(destination, port);
#endif
@ -145,7 +145,7 @@ NETServerSocket *NETServerSocket::NETServerFactory(SocketTypesE socketType,
switch (socketType) {
case SOCKET_TYPE_TCP: return new TCPServerSocket(port);
#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#if !defined(OS2) && !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
case SOCKET_TYPE_ENET: return new ENETServerSocket(port);
#endif
@ -156,7 +156,7 @@ NETServerSocket *NETServerSocket::NETServerFactory(SocketTypesE socketType,
// --- ENet UDP NET INTERFACE ------------------------------------------------
#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#if !defined(OS2) && !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
class enet_manager_t {
public:
enet_manager_t()

4
src/hardware/serialport/misc_util.h
View File

@ -64,7 +64,7 @@
#include <SDL_net.h>
#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#if !defined(OS2) && !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#include "enet.h"
#endif
@ -131,7 +131,7 @@ public:
// --- ENET UDP NET INTERFACE ------------------------------------------------
#if !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
#if !defined(OS2) && !defined(__MINGW32__) || defined(__MINGW64_VERSION_MAJOR)
class ENETServerSocket : public NETServerSocket {
public:
ENETServerSocket(uint16_t port);