public
Description: A 3D graphical interface for NetHack and Slash'EM
Homepage:
Clone URL: git://github.com/clivecrous/noegnud.git
Click here to lend your support to: noegnud and make a donation at www.pledgie.com !
Merge post 0.8.5 fixes from nethack-win32 as well as fix a linking issue
This fix is a bit hackish (ok for now though) and should be cleaned up before 
the next release
clivecrous (author)
Sun Nov 16 03:43:14 -0800 2008
commit  2e831b82f926ca76b0c0378d365c3a67cd4067ca
tree    bb59916753a57bfe85079588c74def9af40d6bc5
parent  f682101f03d9bb6ce3380fe338f9458a0b263ff6
...
36
37
38
 
 
 
 
 
 
 
39
40
41
...
215
216
217
218
219
 
 
220
221
222
...
378
379
380
381
382
383
384
 
385
386
387
...
448
449
450
451
452
453
454
455
456
457
...
736
737
738
739
 
740
741
742
...
36
37
38
39
40
41
42
43
44
45
46
47
48
...
222
223
224
 
 
225
226
227
228
229
...
385
386
387
 
 
 
 
388
389
390
391
...
452
453
454
 
 
 
 
455
456
457
...
736
737
738
 
739
740
741
742
0
@@ -36,6 +36,13 @@ GAME = noegnud-SlashEM
0
 # The GNU Make has a problem if you include a drive spec below (unfortunately).
0
 GAMEDIR = ..\binary
0
 
0
+MINGW = /mingw
0
+GNUWIN32 = $(MINGW)/GnuWin32/gnuwin32/
0
+MSYS = /msys/1.0/local
0
+SDLCFLAGS = -I$(GNUWIN32)/include -I$(MSYS)/include -I$(MINGW)/include -I$(MINGW)/include/SDL -I$(GNUWIN32)/include/SDL -I$(MSYS)/include/SDL
0
+SDLLFLAGS = -L$(GNUWIN32)/lib -L$(MSYS)/lib -L$(MINGW)/lib
0
+SDLLIBS = -lmingw32 -lSDLmain -lSDL_image -lpng -lSDL_mixer -lSDL_ttf -lfreetype -lSDL -mwindows
0
+
0
 #
0
 # Directories
0
 #
0
@@ -215,8 +222,8 @@ else
0
 #LFLAGS = -pg
0
 
0
 #    Normal
0
-CFLAGS = -c -O2 -I../include $(DLBFLG) $(SDLCFLAGS) -DSLASHEM_0_0_7E7F2
0
-LFLAGS =
0
+CFLAGS = -c -O2 -I../include $(DLBFLG) $(SDLCFLAGS) -DSLASHEM
0
+LFLAGS = $(SDLLFLAGS)
0
 
0
 # Comment out this line if you have also commented out TTY_GRAPHICS in config.h
0
 # CFLAGS += -DWIN32CON
0
@@ -378,10 +385,7 @@ LFLAGS += -mwindows
0
 else
0
 ifeq ($(USE_NOEGNUD),Y)
0
 WINSRC += $(WINNOEGNUDSRC)
0
-MSYS = /msys/1.0
0
-SDLCFLAGS = -I$(MSYS)/local/include/SDL
0
-LFLAGS += -mconsole -L$(MSYS)/local/lib
0
-SDLLIBS = -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_image
0
+LFLAGS += -mwindows -L$(MSYS)/local/lib
0
 WOBJ04 += noegnudres.o tile.o
0
 CFLAGS += -I$(WNOEGNUD)
0
 else
0
@@ -448,10 +452,6 @@ ifeq ($(USE_GTK),Y)
0
 WINLIB +=$(WINGTKLIB)
0
 endif
0
 
0
-ifeq ($(USE_NOEGNUD),Y)
0
-WINLIB = $(WINNOEGNUDLIB)
0
-endif
0
-
0
 ifeq ($(USE_PROXY),Y)
0
 WINLIB += $(WINPROXYLIB)
0
 endif
0
@@ -736,7 +736,7 @@ else
0
 ifeq ($(USE_NOEGNUD),Y)
0
 $(GAMEFILE): gamedir.tag utility.tag $(NHALLOCDLL) $(NHALLOCA) \
0
     $(ALLOBJ) $(GAME).lnk
0
-  $(LINK) $(LFLAGS) $(GTKGCCFLAGS) -o$(GAME).exe $(GAME).lnk
0
+  $(LINK) $(LFLAGS) $(GTKGCCFLAGS) -o$(GAME).exe $(GAME).lnk $(WINNOEGNUDLIB)
0
   $(COPY) $(GAME).exe $(GAMEFILE)
0
   $(DEL) $(GAME).exe
0
 else

Comments