Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mingw-wx-sdl2 makefile now builds if wxrc.exe doesn't exist. Patch from bit.

Browse source
This commit is contained in:
SarahW 2017-08-01 11:55:29 +01:00
commit 0c63c99b71
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Makefile.mingw-wx-sdl2
View file

@ -2,10 +2,9 @@ VPATH = . dosbox resid-fp
CPP = g++ CPP = g++
CC = gcc CC = gcc
WINDRES = windres.exe WINDRES = windres.exe
WXRC = ../utils/wx/wxrc.exe
WXVERSION = 31 WXVERSION = 31
WXINCLUDE = C:/MinGW/include/wx/ WXINCLUDE = C:/MinGW/include/wx/
CFLAGS = -O3 -march=i686 -fomit-frame-pointer -msse2 -mstackrealign -Werror -fno-strict-aliasing -IC:\MinGW\lib\mswu CFLAGS = -O3 -march=i686 -fomit-frame-pointer -msse2 -mstackrealign -Werror -fno-strict-aliasing
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad.o cdrom-ioctl.o cdrom-image.o \ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad.o cdrom-ioctl.o cdrom-image.o \
codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_686.o codegen_timing_common.o codegen_timing_pentium.o codegen_timing_winchip.o codegen_x86.o compaq.o config.o cpu.o dac.o \ codegen.o codegen_ops.o codegen_timing_486.o codegen_timing_686.o codegen_timing_common.o codegen_timing_pentium.o codegen_timing_winchip.o codegen_x86.o compaq.o config.o cpu.o dac.o \
@ -43,7 +42,7 @@ clean :
rm *.res rm *.res
wx-resources.o : pc.xrc wx-resources.o : pc.xrc
$(WXRC) -c pc.xrc -o wx-resources.cpp -wxrc -c pc.xrc -o wx-resources.cpp
$(CPP) $(CXXFLAGS) -c wx-resources.cpp $(CPP) $(CXXFLAGS) -c wx-resources.cpp
%.o : %.c %.o : %.c