[Scummvm-cvs-logs] SF.net SVN: scummvm:[55141] scummex/trunk

[Kirben at users.sourceforge.net]

Revision: 55141
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55141&view=rev
Author:   Kirben
Date:     2011-01-07 05:37:56 +0000 (Fri, 07 Jan 2011)

Log Message:
-----------
Minor updates for mingw compile.

Modified Paths:
--------------
    scummex/trunk/Makefile.mingw
    scummex/trunk/scummsys.h
    scummex/trunk/wxwindows.cpp

Modified: scummex/trunk/Makefile.mingw
===================================================================
--- scummex/trunk/Makefile.mingw	2011-01-07 05:30:57 UTC (rev 55140)
+++ scummex/trunk/Makefile.mingw	2011-01-07 05:37:56 UTC (rev 55141)
@@ -6,8 +6,8 @@
 SDL_CFLAGS=-I$(SRC)/sdl/include
 SDL_LIBS=-L$(SRC)/sdl/lib -lSDLmain -lSDL
 
-WX_CFLAGS= -I/usr/local/include `wxmsw-2.4-config --cxxflags`
-WX_LIBS=`wxmsw-2.4-config --libs`
+WX_CFLAGS= -I/usr/local/include `wx-config --cxxflags`
+WX_LIBS=`wx-config --libs`
 
 CXX     := c++
 AR      := ar cru
@@ -45,7 +45,7 @@
 	$(CXX) $+ ${LIBS} -o $@
 
 resources.o:
-	windres --include-dir /usr/local/include image.rc $@
+	windres --include-dir /mingw/include/wx-2.8 image.rc $@
 
 clean:
 	rm -f scummex $(OBJS)

Modified: scummex/trunk/scummsys.h
===================================================================
--- scummex/trunk/scummsys.h	2011-01-07 05:30:57 UTC (rev 55140)
+++ scummex/trunk/scummsys.h	2011-01-07 05:37:56 UTC (rev 55141)
@@ -79,7 +79,6 @@
 	#define FORCEINLINE inline
 	#define NORETURN __attribute__((__noreturn__))
 	#define GCC_PACK __attribute__((packed))
-	#define _HEAPOK 0
 
 	typedef unsigned char byte;
 	typedef unsigned char uint8;

Modified: scummex/trunk/wxwindows.cpp
===================================================================
--- scummex/trunk/wxwindows.cpp	2011-01-07 05:30:57 UTC (rev 55140)
+++ scummex/trunk/wxwindows.cpp	2011-01-07 05:37:56 UTC (rev 55141)
@@ -939,7 +939,7 @@
 
 void MainWindow::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-	wxMessageDialog *dialog = new wxMessageDialog(this, wxT("\nScummEX 0.1.0cvs (C) 2003 The ScummVM project\n"),wxT("About"), wxOK|wxCENTRE);
+	wxMessageDialog *dialog = new wxMessageDialog(this, wxT("\nScummEX 0.1.0svn (C) 2003 The ScummVM project\n"),wxT("About"), wxOK|wxCENTRE);
 	dialog->ShowModal();
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.