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

Several cleanups, dynloading OpenAL and FluidSynth, update makefile for crosscompiling using MinGW.

Browse Source
This commit is contained in:
waltje
2018-02-24 23:16:21 -05:00
parent 779cbe062d
commit 51aecc4ba6
10 changed files with 733 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/win/Makefile.mingw
View File

@@ -6,9 +6,9 @@
#
# This file is part of the VARCem Project.
#
# Makefile for Win32 (MinGW32) environment.
# Makefile for Windows systems using the MinGW32 environment.
#
# Version: @(#)Makefile.mingw 1.0.3 2018/02/22
# Version: @(#)Makefile.mingw 1.0.4 2018/02/24
#
# Author: Fred N. van Kempen, <decwiz@yahoo.com>
#
@@ -62,6 +62,9 @@ endif
ifndef CRASHDUMP
CRASHDUMP := n
endif
ifndef CROSS
CROSS := n
endif
ifndef DEBUG
DEBUG := n
endif
@@ -143,7 +146,6 @@ ifeq ($(DEV_BUILD), y)
DEBUG := y
CRASHDUMP := y
DEV_BRANCH := y
VNC := y
I686 := y
AMD_K := y
GREENB := y
@@ -197,14 +199,45 @@ VPATH := $(EXPATH) . cpu \
sound/munt/srchelper \
sound/resid-fp \
scsi video lzf network network/slirp win
ifeq ($(X64), y)
CPP := g++ -m64
CC := gcc -m64
#
# Select the required build environment. We have, uhm, many..
#
#
ifneq ($(CROSS), n)
# Cross-compiling (under Linux), select proper version.
ifeq ($(X64), y)
MINGW := x86_64-w64-mingw32
else
MINGW := i686-w64-mingw32
endif
ifeq ($(X64), y)
CPP := /usr/bin/$(MINGW)-g++ -m64
CC := /usr/bin/$(MINGW)-gcc -m64
else
CPP := /usr/bin/$(MINGW)-g++ -m32
CC := /usr/bin/$(MINGW)-gcc -m32
endif
WINDRES := /usr/bin/$(MINGW)-windres
SYSINC := -I/usr/$(MINGW)/include -I../mingw/include
SYSLIB := -L/usr/$(MINGW)/lib
else
CPP := g++ -m32
CC := gcc -m32
# Native compilation using MinGW for Windows.
ifeq ($(X64), y)
CPP := g++ -m64
CC := gcc -m64
else
CPP := g++ -m32
CC := gcc -m32
endif
WINDRES := windres
SYSINC :=
SYSLIB :=
endif
WINDRES := windres
DEPS = -MMD -MF $*.d -c $<
DEPFILE := win/.depends
@@ -216,6 +249,10 @@ endif
ifdef EXINC
OPTS += -I$(EXINC)
endif
OPTS += $(SYSINC)
ifneq ($(CROSS), n)
OPTS += -DUSE_CROSS
endif
ifeq ($(X64), y)
ifeq ($(OPTIM), y)
DFLAGS := -march=native
@@ -550,7 +587,6 @@ endif
LZFOBJ := lzf_c.o lzf_d.o
LIBS := -mwindows \
-lopenal.dll \
-lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 \
-lcomctl32 -lwinmm
ifeq ($(VNC), y)

3
src/win/VARCem.rc
View File

@@ -8,7 +8,7 @@
*
* Application resource script for Windows.
*
* Version: @(#)VARCem.rc 1.0.2 2018/02/21
* Version: @(#)VARCem.rc 1.0.3 2018/02/24
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -974,6 +974,7 @@ BEGIN
IDS_2175 "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0All files (*.*)\0*.*\0"
IDS_2176 "ZIP images (*.IM?;*.ZDI)\0*.IM?;*.ZDI\0"
IDS_2177 "ZIP %i (%03i): %ls"
IDS_2178 "Unable to initialize OpenAL, make sure you have the following library\nin your program folder:\n\nlibopenal-1.dll"
IDS_4096 "Hard disk (%s)"
IDS_4097 "%01i:%01i"