slashem/include/rpcndr.h @@ -36,6 +36,13 @@ GAME = noegnud-SlashEM # The GNU Make has a problem if you include a drive spec below (unfortunately). GAMEDIR = ..\binary +MINGW = /mingw +GNUWIN32 = $(MINGW)/GnuWin32/gnuwin32/ +MSYS = /msys/1.0/local +SDLCFLAGS = -I$(GNUWIN32)/include -I$(MSYS)/include -I$(MINGW)/include -I$(MINGW)/include/SDL -I$(GNUWIN32)/include/SDL -I$(MSYS)/include/SDL +SDLLFLAGS = -L$(GNUWIN32)/lib -L$(MSYS)/lib -L$(MINGW)/lib +SDLLIBS = -lmingw32 -lSDLmain -lSDL_image -lpng -lSDL_mixer -lSDL_ttf -lfreetype -lSDL -mwindows + # # Directories # @@ -215,8 +222,8 @@ else #LFLAGS = -pg # Normal -CFLAGS = -c -O2 -I../include $(DLBFLG) $(SDLCFLAGS) -DSLASHEM_0_0_7E7F2 -LFLAGS = +CFLAGS = -c -O2 -I../include $(DLBFLG) $(SDLCFLAGS) -DSLASHEM +LFLAGS = $(SDLLFLAGS) # Comment out this line if you have also commented out TTY_GRAPHICS in config.h # CFLAGS += -DWIN32CON @@ -378,10 +385,7 @@ LFLAGS += -mwindows else ifeq ($(USE_NOEGNUD),Y) WINSRC += $(WINNOEGNUDSRC) -MSYS = /msys/1.0 -SDLCFLAGS = -I$(MSYS)/local/include/SDL -LFLAGS += -mconsole -L$(MSYS)/local/lib -SDLLIBS = -lmingw32 -lSDLmain -lSDL -lSDL_mixer -lSDL_image +LFLAGS += -mwindows -L$(MSYS)/local/lib WOBJ04 += noegnudres.o tile.o CFLAGS += -I$(WNOEGNUD) else @@ -448,10 +452,6 @@ ifeq ($(USE_GTK),Y) WINLIB +=$(WINGTKLIB) endif -ifeq ($(USE_NOEGNUD),Y) -WINLIB = $(WINNOEGNUDLIB) -endif - ifeq ($(USE_PROXY),Y) WINLIB += $(WINPROXYLIB) endif @@ -736,7 +736,7 @@ else ifeq ($(USE_NOEGNUD),Y) $(GAMEFILE): gamedir.tag utility.tag $(NHALLOCDLL) $(NHALLOCA) \ $(ALLOBJ) $(GAME).lnk - $(LINK) $(LFLAGS) $(GTKGCCFLAGS) -o$(GAME).exe $(GAME).lnk + $(LINK) $(LFLAGS) $(GTKGCCFLAGS) -o$(GAME).exe $(GAME).lnk $(WINNOEGNUDLIB) $(COPY) $(GAME).exe $(GAMEFILE) $(DEL) $(GAME).exe else slashem/sys/winnt/Makefile.gcc f682101f03d9bb6ce3380fe338f9458a0b263ff6 Clive Crous clive@crous.co.za http://github.com/clivecrous/noegnud/commit/2e831b82f926ca76b0c0378d365c3a67cd4067ca 2e831b82f926ca76b0c0378d365c3a67cd4067ca 2008-11-16T03:43:14-08:00 2008-11-16T03:43:14-08:00 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 bb59916753a57bfe85079588c74def9af40d6bc5 Clive Crous clive@crous.co.za