runtime: Fix up linking and code

This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-01-18 21:27:35 +01:00
parent a4bb9f68fe
commit 7f54ca5f55
2 changed files with 24 additions and 13 deletions
+20 -7
View File
@@ -4,7 +4,7 @@ add_subdirectory(lib)
add_subdirectory(gfx) add_subdirectory(gfx)
add_subdirectory(blitz3d) add_subdirectory(blitz3d)
add_library(${PROJECT_NAME} MODULE add_library(${PROJECT_NAME} SHARED
"bbruntime_dll.hpp" "bbruntime_dll.hpp"
"bbruntime_dll.cpp" "bbruntime_dll.cpp"
"resource.hpp" "resource.hpp"
@@ -12,14 +12,27 @@ add_library(${PROJECT_NAME} MODULE
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PRIVATE config
runtime_lib runtime_lib
runtime_gfx runtime_gfx
stdutil runtime_blitz3d
${fmod_LIBRARIES} stdutil
${FreeImage_LIBRARIES} ${fmod_LIBRARIES}
${FreeImage_LIBRARIES}
ddraw
dsound
dxguid
mswsock
shell32
winmm
) )
if(MSVC)
target_compile_options(${PROJECT_NAME}
PRIVATE /EHa
)
endif()
#target_include_directories(${PROJECT_NAME} #target_include_directories(${PROJECT_NAME}
# #
#) #)
+4 -6
View File
@@ -1,12 +1,12 @@
/* Win32 runtime dynamic link lib */ /* Win32 runtime dynamic link lib */
#ifndef BBRUNTIME_DLL_H #pragma once
#define BBRUNTIME_DLL_H #include <streambuf>
#include <stdutil.hpp>
#include <windows.h> #include <windows.h>
#include "stdutil.hpp"
class Debugger; class Debugger;
@@ -26,5 +26,3 @@ class Runtime {
}; };
extern "C" _declspec(dllexport) Runtime* _cdecl runtimeGetRuntime(); extern "C" _declspec(dllexport) Runtime* _cdecl runtimeGetRuntime();
#endif