mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Update Makefile

pull/4/head
galaxyhaxz 8 years ago committed by GitHub
parent
e488eca732
commit
a925dbb413
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile

4
Makefile
Unescape View File

@ -2,9 +2,11 @@
ifdef MINGW32 ifdef MINGW32
CXX=mingw32-g++ CXX=mingw32-g++
DLLTOOL=dlltool DLLTOOL=dlltool
WINDRES=windres
else else
CXX=i686-w64-mingw32-g++ CXX=i686-w64-mingw32-g++
DLLTOOL=i686-w64-mingw32-dlltool DLLTOOL=i686-w64-mingw32-dlltool
WINDRES=i686-w64-mingw32-windres
endif endif
# Clang doesn't understand permissive compilation, we need to "fix" invalid # Clang doesn't understand permissive compilation, we need to "fix" invalid
@ -29,7 +31,7 @@ devilution.exe: $(OBJS) $(PKWARE_OBJS) diabres.o diabloui.lib storm.lib
$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
diabres.o: Diablo.rc diabres.o: Diablo.rc
windres $< $@ $(WINDRES) $< $@
diabloui.lib: diabloui.dll DiabloUI/diabloui_gcc.def diabloui.lib: diabloui.dll DiabloUI/diabloui_gcc.def
$(DLLTOOL) -d DiabloUI/diabloui_gcc.def -D $< -l $@ $(DLLTOOL) -d DiabloUI/diabloui_gcc.def -D $< -l $@

Write Preview
Loading…
Cancel
Save