win compilation, interlace hack

Author: zoltanvb

src/libretro/Makefile.common

@@ -37,7 +37,6 @@ SOURCES_CPP := \
 	$(CORE_DIR)/beeb/src/VideoULA.cpp \
 	$(CORE_DIR)/shared/c/log.cpp \
 	$(CORE_DIR)/shared/c/system.cpp \
-	$(CORE_DIR)/shared/c/system_linux.cpp \
 	$(CORE_DIR)/shared/c/mutex.cpp \
 	$(CORE_DIR)/shared/c/CommandLineParser.cpp \
 	$(CORE_DIR)/b2/BeebConfig.cpp \
@@ -55,9 +54,29 @@ SOURCES_CPP := \
 
 SOURCES_C := \
 	$(CORE_DIR)/6502/c/6502.c \
-	$(CORE_DIR)/shared/c/system_posix.c \
 	$(CORE_DIR)/shared/c/path.c \
-		
+
+	
+ifneq (,$(findstring osx,$(platform)))
+SOURCES_CPP += \
+	$(CORE_DIR)/shared/c/system_osx.cpp \
+
+SOURCES_C += \
+	$(CORE_DIR)/shared/c/system_posix.c \
+
+else ifneq (,$(findstring unix,$(platform)))
+SOURCES_CPP += \
+	$(CORE_DIR)/shared/c/system_linux.cpp \
+
+SOURCES_C += \
+	$(CORE_DIR)/shared/c/system_posix.c \
+
+else ifneq (,$(findstring win,$(platform)))
+SOURCES_CPP += \
+	$(CORE_DIR)/shared/c/system_windows.cpp \
+
+endif
+
 #beeb: all included
 #shared:
 #debug.cpp

src/libretro/core.cpp

@@ -1,12 +1,30 @@
 /* TODO
 
+sudo docker run --rm -v "/media/storage/Documents/dev/b2-libretro:/build" git.libretro.com:5050/libretro-infrastructure/libretro-build-mxe-win32-cross:gcc10 bash -c "cd /build/src/libretro && make clean && make -j6"
+
+    export platform=win32
+    export ARCH=x86
+    export MSYSTEM=MINGW32
+    export AR=i686-w64-mingw32.static-ar
+    export AS=i686-w64-mingw32.static-as
+    export CC=i686-w64-mingw32.static-gcc
+    export CXX=i686-w64-mingw32.static-g++
+    export WINDRES=i686-w64-mingw32.static-windres
+
+
 manage static 6502_internal.inl
-finish key layout, handle key not found
 joypad controls
 
+core options
+   autoboot on/off
+   machine model
+
 load game with disc input (paste?)
 set shift state on initial boot?
 
+include roms in .h
+run main cycle until screen update
+
 different controls
 
 fix sound distortion - more or less OK
@@ -20,6 +38,9 @@ tape input?
 hook up reset
 disc autostart?
 intelligent zoom?
+graphics line check (interlace, etc)?
+   *tv0,0 *tv0,1 are not different for some reason? test program?
+   fake interlace - based on register?
 
 }
 
@@ -581,7 +602,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
   info->geometry = (struct retro_game_geometry)
   {
     .base_width   = TV_TEXTURE_WIDTH,
-    .base_height  = TV_TEXTURE_HEIGHT,
+    .base_height  = TV_TEXTURE_HEIGHT/2,
     .max_width    = TV_TEXTURE_WIDTH,
     .max_height   = TV_TEXTURE_HEIGHT,
     .aspect_ratio = aspect,
@@ -893,7 +914,8 @@ void retro_run(void)
 
    std::vector<uint32_t> result(pixels, pixels + TV_TEXTURE_WIDTH * TV_TEXTURE_HEIGHT);
    unsigned stride  = TV_TEXTURE_WIDTH;
-   video_cb(pixels, TV_TEXTURE_WIDTH, TV_TEXTURE_HEIGHT, stride << 2);
+   //video_cb(pixels, TV_TEXTURE_WIDTH, TV_TEXTURE_HEIGHT, stride << 2);
+   video_cb(pixels, TV_TEXTURE_WIDTH, TV_TEXTURE_HEIGHT/2, stride << 3);
    const SoundDataUnit *aa, *bb;
    if (m_sound_output.GetConsumerBuffers(&aa, &na, &bb, &nb))
    {
@@ -1005,6 +1027,7 @@ bool retro_load_game(const struct retro_game_info *info)
     core->SetSidewaysROM(15, LoadROM("BASIC2.ROM"));
     core->SetSidewaysROM(14, LoadROM("DFS-2.26.ROM"));
 
+  core->SetKeyState(BeebKey_Shift,true);  
 
   std::string path = info->path;
   core->SetDiscImage(0, DirectDiscImage::CreateForFile(path, nullptr));

src/shared/c/system_windows.cpp

@@ -147,7 +147,7 @@ const char *GetErrorDescription(DWORD error) {
 
     if (n == 0) {
         /* Bleargh. */
-
+#ifndef B2_LIBRETRO_CORE
 #define CASE(X) \
     case (X):   \
         return #X
@@ -182,7 +182,7 @@ const char *GetErrorDescription(DWORD error) {
         }
 
 #undef CASE
-
+#endif
     } else {
         /* For some reason, Windows error strings end with a carriage
          * return. */
@@ -308,7 +308,7 @@ int GetTerminalWidth(void) {
 // https://msdn.microsoft.com/en-us/library/windows/desktop/mt774976(v=vs.85).aspx...
 // but that's only from Windows 10 build 1607! Seems a bit rude to
 // require that when everything else only needs Vista+.
-
+#ifndef B2_LIBRETRO_CORE
 #include <shared/pshpack8.h>
 struct THREADNAME_INFO {
     DWORD dwType;
@@ -359,7 +359,9 @@ void SetCurrentThreadNameInternal(const char *name) {
         }
     }
 }
-
+#else
+void SetCurrentThreadNameInternal(const char *name) {}
+#endif
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
 

src/shared/h/shared/system_windows.h

@@ -6,7 +6,7 @@
 
 //////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////
-
+#ifndef B2_LIBRETRO_CORE
 #ifdef _WIN32_WINNT
 // 0x600 = Vista+; 0x601 = Win7+; 0x602 = Win8+;
 #if _WIN32_WINNT < 0x601
@@ -15,6 +15,9 @@
 #else
 #define _WIN32_WINNT 0x601
 #endif
+#else
+size_t strlcpy(char *dest, const char *src, size_t size);
+#endif
 
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN