claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small changes to the ET4000 driver.

Browse Source 
Updates to allow debug binaries in the same folder.
Changes to move the Language Packs into lang/ under ExePath.
Removed the GREENB machine, just another AMI486 machine.
This commit is contained in:
waltje
2018-08-26 23:54:14 -04:00
parent 0470950556
commit 15d9edf697
12 changed files with 108 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/win/mingw/Makefile.MinGW
View File

@@ -8,7 +8,7 @@
#
# Makefile for Windows systems using the MinGW32 environment.
#
# Version: @(#)Makefile.mingw 1.0.51 2018/08/14
# Version: @(#)Makefile.mingw 1.0.52 2018/08/26
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -119,9 +119,6 @@ endif
ifndef PORTABLE3
PORTABLE3 := n
endif
ifndef GREENB
GREENB := n
endif
ifndef I686
I686 := n
endif
@@ -149,6 +146,7 @@ endif
# Name of the executable.
NETIF := pcap_if
ifndef PROG
ifneq ($(WX), n)
PROG := WxVARCem
@@ -156,6 +154,10 @@ ifndef PROG
PROG := VARCem
endif
endif
ifeq ($(DEBUG), y)
PROG := $(PROG)-d
NETIF := $(NETIF)-d
endif
# Which modules to include a development build.
@@ -165,7 +167,6 @@ ifeq ($(DEV_BUILD), y)
AMD_K := y
LASERXT := y
PORTABLE3 := y
GREENB := y
I686 := y
PAS16 := y
STEALTH32 := y
@@ -518,11 +519,6 @@ ifeq ($(DEV_BRANCH), y)
OPTS += -DUSE_PORTABLE3
endif
ifeq ($(GREENB), y)
OPTS += -DUSE_GREENB
DEVBROBJ += m_at_4gpv31.o
endif
ifeq ($(I686), y)
OPTS += -DUSE_I686
DEVBROBJ += m_at_440fx.o
@@ -751,7 +747,7 @@ else
endif
all: $(PREBUILD) $(PROG).exe pcap_if.exe $(POSTBUILD)
all: $(PREBUILD) $(PROG).exe $(NETIF).exe $(POSTBUILD)
VARCem.res: VARCem.rc VARCem.mpp
@@ -763,7 +759,7 @@ VARCem.res: VARCem.rc VARCem.mpp
$(PROG).exe: $(OBJ) VARCem.res
@echo Linking $(PROG).exe ..
@$(CC) $(LDFLAGS) -o $(PROG).exe \
@$(CC) $(LDFLAGS) -o $@ \
$(OBJ) VARCem.res $(LIBS)
ifneq ($(DEBUG), y)
@strip $(PROG).exe
@@ -773,18 +769,12 @@ pcap_if.res: pcap_if.rc
@echo Processing $<
@$(WINDRES) $(RFLAGS) -i $< -o pcap_if.res
pcap_if.exe: pcap_if.o win_dynld.o pcap_if.res
@echo Linking pcap_if.exe ..
@$(CC) $(LDFLAGS) -o pcap_if.exe \
$(NETIF).exe: pcap_if.o win_dynld.o pcap_if.res
@echo Linking $(NETIF).exe ..
@$(CC) $(LDFLAGS) -o $@ \
pcap_if.o win_dynld.o pcap_if.res
ifneq ($(DEBUG), y)
@strip pcap_if.exe
endif
hello.exe: hello.o
$(CXX) $(LDFLAGS) -o hello.exe hello.o $(WXLIBS) $(LIBS)
ifneq ($(DEBUG), y)
@strip hello.exe
@strip $(NETIF).exe
endif

30
src/win/msvc/Makefile.VC
View File

@@ -8,7 +8,7 @@
#
# Makefile for Windows using Visual Studio 2015.
#
# Version: @(#)Makefile.VC 1.0.38 2018/08/12
# Version: @(#)Makefile.VC 1.0.39 2018/08/26
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -120,9 +120,6 @@ endif
ifndef PORTABLE3
PORTABLE3 := n
endif
ifndef GREENB
GREENB := n
endif
ifndef I686
I686 := n
endif
@@ -150,6 +147,7 @@ endif
# Name of the executable.
NETIF := pcap_if
ifndef PROG
ifneq ($(WX), n)
PROG := WxVARCem
@@ -157,6 +155,10 @@ ifndef PROG
PROG := VARCem
endif
endif
ifeq ($(DEBUG), y)
PROG := $(PROG)-d
NETIF := $(NETIF)-d
endif
# Which modules to include a development build.
@@ -166,7 +168,6 @@ ifeq ($(DEV_BUILD), y)
AMD_K := y
LASERXT := y
PORTABLE3 := y
GREENB := y
I686 := y
PAS16 := y
STEALTH32 := y
@@ -492,11 +493,6 @@ ifeq ($(DEV_BRANCH), y)
OPTS += -DUSE_PORTABLE3
endif
ifeq ($(GREENB), y)
OPTS += -DUSE_GREENB
DEVBROBJ += m_at_4gpv31.obj
endif
ifeq ($(I686), y)
OPTS += -DUSE_I686
DEVBROBJ += m_at_440fx.obj
@@ -718,7 +714,7 @@ else
endif
all: $(PREBUILD) $(PROG).exe pcap_if.exe $(POSTBUILD)
all: $(PREBUILD) $(PROG).exe $(NETIF).exe $(POSTBUILD)
#
# This rule creates a script (command file) that figures out which
@@ -774,16 +770,11 @@ pcap_if.res: pcap_if.rc
@echo Processing $<
@$(WINDRES) $(RFLAGS) -fo$@ $<
pcap_if.exe: pcap_if.obj win_dynld.obj pcap_if.res
@echo Linking pcap_if.exe ..
@$(LINK) $(LDFLAGS) $(LOPTS_C) -OUT:pcap_if.exe \
$(NETIF).exe: pcap_if.obj win_dynld.obj pcap_if.res
@echo Linking $(NETIF).exe ..
@$(LINK) $(LDFLAGS) $(LOPTS_C) -OUT:$@ \
pcap_if.obj win_dynld.obj pcap_if.res
hello.exe: hello.obj
$(LINK) $(LDFLAGS) $(LOPTS_C) -OUT:hello.exe \
hello.obj $(WXLIBS) $(LIBS)
clean:
@echo Cleaning objects..
@-del *.obj 2>NUL
@@ -802,6 +793,7 @@ ifeq ($(PROFILER), y)
endif
@-del win\*.manifest 2>NUL
@-del *.dll 2>NUL
@-del win\Mklang.cmd
# @del $(DEPFILE) 2>NUL
ifneq ($(AUTODEP), y)

4
src/win/win_lang.c
View File

@@ -8,7 +8,7 @@
*
* Handle language support for the platform.
*
* Version: @(#)win_lang.c 1.0.4 2018/06/09
* Version: @(#)win_lang.c 1.0.5 2018/08/26
*
* Author: Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -167,7 +167,7 @@ lang_scan(void)
languages_num = 0;
/* Open the "language modules" directory. */
swprintf(path, sizeof_w(temp), L"%ls%ls", emu_path, LANGUAGE_PATH);
swprintf(path, sizeof_w(temp), L"%ls%ls", exe_path, LANGUAGE_PATH);
dir = opendir(path);
if (dir != NULL) {
/* Scan all files, and see if we find a usable one. */