71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
|
diff -rupN hypseus.orig/src/CMakeLists.txt hypseus.new/src/CMakeLists.txt
|
||
|
|
--- hypseus.orig/src/CMakeLists.txt 2021-02-09 18:13:21.665745426 -0500
|
||
|
|
+++ hypseus.new/src/CMakeLists.txt 2021-02-09 19:45:52.277715721 -0500
|
||
|
|
@@ -37,15 +37,16 @@ include(GNUInstallDirs)
|
||
|
|
include(GetGitRevisionDescription)
|
||
|
|
include(InstallRequiredSystemLibraries)
|
||
|
|
include(FindPkgConfig)
|
||
|
|
-include(ExternalProject)
|
||
|
|
-include(BuildLibMPEG2)
|
||
|
|
+#include(ExternalProject)
|
||
|
|
+#include(BuildLibMPEG2)
|
||
|
|
|
||
|
|
use_cxx11( )
|
||
|
|
|
||
|
|
PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
|
||
|
|
PKG_SEARCH_MODULE(SDL2_TTF REQUIRED SDL2_ttf)
|
||
|
|
PKG_SEARCH_MODULE(SDL2_IMAGE REQUIRED SDL2_image)
|
||
|
|
-build_libmpeg2( )
|
||
|
|
+PKG_SEARCH_MODULE(MPEG2 REQUIRED libmpeg2)
|
||
|
|
+#build_libmpeg2( )
|
||
|
|
|
||
|
|
message(STATUS "Target: ${CMAKE_SYSTEM_NAME} ${CMAKE_TARGET_ARCHITECTURES}")
|
||
|
|
|
||
|
|
@@ -73,6 +74,7 @@ message(STATUS "Version: ${VER_TAG}")
|
||
|
|
include_directories(
|
||
|
|
${PROJECT_BINARY_DIR} # config.h
|
||
|
|
${SDL2_INCLUDE_DIRS}
|
||
|
|
+ ${MPEG2_INCLUDE_DIRS}
|
||
|
|
)
|
||
|
|
|
||
|
|
if( "${CMAKE_TARGET_ARCHITECTURES}" MATCHES "i386" )
|
||
|
|
@@ -98,10 +100,10 @@ add_subdirectory(timer)
|
||
|
|
add_subdirectory(video)
|
||
|
|
add_subdirectory(vldp)
|
||
|
|
|
||
|
|
-add_dependencies( vldp libmpeg2 )
|
||
|
|
-add_dependencies( ldp-out vldp )
|
||
|
|
-add_dependencies( game vldp )
|
||
|
|
-add_dependencies( sound vldp )
|
||
|
|
+#add_dependencies( vldp libmpeg2 )
|
||
|
|
+#add_dependencies( ldp-out vldp )
|
||
|
|
+#add_dependencies( game vldp )
|
||
|
|
+#add_dependencies( sound vldp )
|
||
|
|
|
||
|
|
add_executable( hypseus hypseus.cpp globals.h )
|
||
|
|
target_link_libraries( hypseus plog io timer sound video cpu game ${SDL2_LIBRARIES} ${SDL2_TTF_LIBRARIES})
|
||
|
|
diff -rupN hypseus.orig/src/vldp/vldp.h hypseus.new/src/vldp/vldp.h
|
||
|
|
--- hypseus.orig/src/vldp/vldp.h 2021-02-09 18:13:21.665745426 -0500
|
||
|
|
+++ hypseus.new/src/vldp/vldp.h 2021-02-09 19:44:56.957310374 -0500
|
||
|
|
@@ -34,6 +34,8 @@ extern "C" {
|
||
|
|
// Ubuntu Linux complains with plain <SDL.h>
|
||
|
|
#include <SDL.h> // only used for threading
|
||
|
|
|
||
|
|
+#include <mpeg2.h>
|
||
|
|
+
|
||
|
|
struct yuv_buf {
|
||
|
|
uint8_t *Y; // Y channel
|
||
|
|
uint8_t *U; // U channel
|
||
|
|
diff -rupN hypseus.orig/src/vldp/vldp_internal.cpp hypseus.new/src/vldp/vldp_internal.cpp
|
||
|
|
--- hypseus.orig/src/vldp/vldp_internal.cpp 2021-02-09 18:13:21.665745426 -0500
|
||
|
|
+++ hypseus.new/src/vldp/vldp_internal.cpp 2021-02-09 19:44:56.957310374 -0500
|
||
|
|
@@ -37,8 +37,6 @@
|
||
|
|
|
||
|
|
#include <inttypes.h>
|
||
|
|
|
||
|
|
-#include <mpeg2.h>
|
||
|
|
-
|
||
|
|
// NOTICE : these variables should only be used by the private thread
|
||
|
|
// !!!!!!!!!!!!
|
||
|
|
|