Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-11-30 16:50:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42 from digarok/win_build_fixes

Browse Source 
resolve builds on windows with new fst objects
This commit is contained in:
Dagen Brock 2018-08-24 12:00:31 -05:00 committed by GitHub
commit 931d2cb626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/config.c
View File

@ -123,7 +123,7 @@ extern char* g_imagewriter_prop_font;
extern int g_imagewriter_paper; extern int g_imagewriter_paper;
extern int g_imagewriter_banner; extern int g_imagewriter_banner;
#if defined(_WIN32) || defined(__CYGWIN__) && !defined(WIN_SDL) #if defined(_WIN32) && !defined(WIN_SDL) || defined(__CYGWIN__) && !defined(WIN_SDL)
extern int g_win_show_console_request; extern int g_win_show_console_request;
extern int g_win_status_debug_request; extern int g_win_status_debug_request;
#endif #endif
@ -416,7 +416,7 @@ Cfg_menu g_cfg_imagewriter_menu[] = {
Cfg_menu g_cfg_devel_menu[] = { Cfg_menu g_cfg_devel_menu[] = {
{ "Developer Options", g_cfg_devel_menu, 0, 0, CFGTYPE_MENU }, { "Developer Options", g_cfg_devel_menu, 0, 0, CFGTYPE_MENU },
#if defined(_WIN32) || defined(__CYGWIN__) && !defined(WIN_SDL) #if defined(_WIN32) && !defined(WIN_SDL) || defined(__CYGWIN__) && !defined(WIN_SDL)
{ "Status lines,0,Hide,1,Show", KNMP(g_win_status_debug_request), CFGTYPE_INT }, { "Status lines,0,Hide,1,Show", KNMP(g_win_status_debug_request), CFGTYPE_INT },
{ "Console,0,Hide,1,Show", KNMP(g_win_show_console_request), CFGTYPE_INT }, { "Console,0,Hide,1,Show", KNMP(g_win_show_console_request), CFGTYPE_INT },
#endif #endif

3
src/dis.c
View File

@ -639,7 +639,8 @@ int read_line(char *buf, int len) {
buf[0] = 0; buf[0] = 0;
ret = 0; ret = 0;
while(space_left > 0) { while(space_left > 0) {
#ifdef _WIN32 #if defined(_WIN32) && !defined(WIN_SDL)
ret = win_nonblock_read_stdin(0, buf, 1); ret = win_nonblock_read_stdin(0, buf, 1);
#else #else
/* Unix */ /* Unix */

4
src/sdl2_driver.c
View File

@ -23,7 +23,9 @@ unsigned int lastTime = 0, currentTime, frames;
#ifdef HAVE_ICON // Currently a flag because not supported outside of SDL builds. Looking at full solution. #ifdef HAVE_ICON // Currently a flag because not supported outside of SDL builds. Looking at full solution.
#include "icongs.h" #include "icongs.h"
#endif #endif
#ifdef _WIN32
#include <unistd.h>
#endif
// BITMASKS // BITMASKS
#define ShiftMask 1 #define ShiftMask 1
#define ControlMask 4 #define ControlMask 4

4
src/sim65816.c
View File

@ -26,7 +26,7 @@ extern char g_config_gsplus_screenshot_dir[];
#include "tfe/protos_tfe.h" #include "tfe/protos_tfe.h"
#endif #endif
#if defined (_WIN32) || defined(__CYGWIN__) && !defined(WIN_SDL) #if defined (_WIN32) && !defined(WIN_SDL)|| defined(__CYGWIN__) && !defined(WIN_SDL)
#define WIN32_LEAN_AND_MEAN /* Tell windows we want less header gunk */ #define WIN32_LEAN_AND_MEAN /* Tell windows we want less header gunk */
#define STRICT /* Tell Windows we want compile type checks */ #define STRICT /* Tell Windows we want compile type checks */
#include <windows.h> /* Need a definition for LPTSTR in CYGWIN */ #include <windows.h> /* Need a definition for LPTSTR in CYGWIN */
@ -1096,7 +1096,7 @@ void gsport_expand_path(char *out_ptr, const char *in_ptr, int maxlen) {
if(!strncmp("0", name_buf, 128)) { if(!strncmp("0", name_buf, 128)) {
/* Replace ${0} with g_argv0_path */ /* Replace ${0} with g_argv0_path */
tmp_ptr = &(g_argv0_path[0]); tmp_ptr = &(g_argv0_path[0]);
#if defined (_WIN32) || defined(__CYGWIN__) && !defined(WIN_SDL) #if defined (_WIN32) && !defined(WIN_SDL)|| defined(__CYGWIN__) && !defined(WIN_SDL)
} else if(!strncmp("PWD", name_buf, 128)) { } else if(!strncmp("PWD", name_buf, 128)) {
/* Replace ${PWD} with cwd in Windows */ /* Replace ${PWD} with cwd in Windows */
get_cwd(out_ptr,128); get_cwd(out_ptr,128);

2
src/vars_win32
View File

@ -1,6 +1,6 @@
TARGET = gsplus32.exe TARGET = gsplus32.exe
FSTOBJ = win32_host_fst.o FSTOBJ = host_common.o win32_host_common.o host_mli.o win32_host_fst.o
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) $(FSTOBJ) scc_windriver.o win32snd_driver.o win_console.o win_generic.o gsplus32.o OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) $(FSTOBJ) scc_windriver.o win32snd_driver.o win_console.o win_generic.o gsplus32.o
CCOPTS = -O2 -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -std=gnu99 -DHAVE_ATBRIDGE CCOPTS = -O2 -DGSPLUS_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -std=gnu99 -DHAVE_ATBRIDGE

8
src/vars_win32_sdl2
View File

@ -3,12 +3,12 @@ NAME = gsplus
MINGW_HOME = /cygdrive/c/mingw/i686-w64-mingw32 MINGW_HOME = /cygdrive/c/mingw/i686-w64-mingw32
FSTOBJ = win32_host_fst.o FSTOBJ = host_common.o win32_host_common.o host_mli.o win32_host_fst.o
OBJECTS = sdl2_driver.o $(OBJECTS1) $(FSTOBJ) sdl2snd_driver.o OBJECTS = sdl2_driver.o $(OBJECTS1) $(FSTOBJ) sdl2snd_driver.o scc_windriver.o
CCOPTS = -O3 -DGSPLUS_LITTLE_ENDIAN -DHAVE_SDL -DWIN_SDL -DTOGGLE_STATUS -I$(MINGW_HOME)/include/SDL2 -DWINSDL_BORDERHACK CCOPTS = -O3 -DGSPLUS_LITTLE_ENDIAN -DWIN32 -D_WIN32 -DHAVE_SDL -DWIN_SDL -DTOGGLE_STATUS -I$(MINGW_HOME)/include/SDL2 -DWINSDL_BORDERHACK -D__USE_W32_SOCKETS -D_WINSOCK2API_
CPPOPTS = -O3 -DGSPLUS_LITTLE_ENDIAN -DHAVE_SDL -DWIN_SDL -DTOGGLE_STATUS -I/usr/include/freetype2 -I$(MINGW_HOME)/include/SDL2 CPPOPTS = -O3 -DGSPLUS_LITTLE_ENDIAN -DWIN32 -D_WIN32 -DHAVE_SDL -DWIN_SDL -DTOGGLE_STATUS -I/usr/include/freetype2 -I$(MINGW_HOME)/include/SDL2 -D__USE_W32_SOCKETS -D_WINSOCK2API_
SUFFIX = ".exe" SUFFIX = ".exe"
# working in cygwin # working in cygwin