Look for OpenAL in the proper way
This commit is contained in:
@@ -50,9 +50,9 @@ target_link_libraries(86Box cpu chipset mch dev mem fdd game cdrom zip mo hdd
|
|||||||
find_package(Freetype REQUIRED)
|
find_package(Freetype REQUIRED)
|
||||||
include_directories(${FREETYPE_INCLUDE_DIRS})
|
include_directories(${FREETYPE_INCLUDE_DIRS})
|
||||||
|
|
||||||
find_package(OpenAL CONFIG REQUIRED)
|
find_package(OpenAL REQUIRED)
|
||||||
include_directories(${OPENAL_INCLUDE_DIR})
|
include_directories(${OPENAL_INCLUDE_DIR})
|
||||||
target_link_libraries(86Box OpenAL::OpenAL)
|
target_link_libraries(86Box ${OPENAL_LIBRARY})
|
||||||
|
|
||||||
find_package(SDL2 CONFIG REQUIRED)
|
find_package(SDL2 CONFIG REQUIRED)
|
||||||
include_directories(${SDL2_INCLUDE_DIRS})
|
include_directories(${SDL2_INCLUDE_DIRS})
|
||||||
|
@@ -2,6 +2,7 @@
|
|||||||
#define _FILE_OFFSET_BITS 64
|
#define _FILE_OFFSET_BITS 64
|
||||||
#define _LARGEFILE64_SOURCE 1
|
#define _LARGEFILE64_SOURCE 1
|
||||||
#endif
|
#endif
|
||||||
|
#define _POSIX_C_SOURCE 200809L
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
@@ -579,8 +580,23 @@ void monitor_thread(void* param)
|
|||||||
{
|
{
|
||||||
if (isatty(fileno(stdin)) && isatty(fileno(stdout)))
|
if (isatty(fileno(stdin)) && isatty(fileno(stdout)))
|
||||||
{
|
{
|
||||||
|
char* line = NULL;
|
||||||
|
size_t n;
|
||||||
printf("86Box monitor console.\n");
|
printf("86Box monitor console.\n");
|
||||||
|
while (!exit_event)
|
||||||
|
{
|
||||||
|
printf("(86Box) ");
|
||||||
|
getline(&line, &n, stdin);
|
||||||
|
if (line)
|
||||||
|
{
|
||||||
|
line[n - 1] = '\0';
|
||||||
|
if (strncasecmp(line, "exit", 4) == 0)
|
||||||
|
{
|
||||||
|
exit_event = 1;
|
||||||
|
}
|
||||||
|
free(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -616,6 +632,7 @@ int main(int argc, char** argv)
|
|||||||
/* Initialize the rendering window, or fullscreen. */
|
/* Initialize the rendering window, or fullscreen. */
|
||||||
|
|
||||||
do_start();
|
do_start();
|
||||||
|
thread_create(monitor_thread, NULL);
|
||||||
while (!is_quit)
|
while (!is_quit)
|
||||||
{
|
{
|
||||||
static int onesec_tic = 0;
|
static int onesec_tic = 0;
|
||||||
|
Reference in New Issue
Block a user