Fix Makefile.qt4 for Linux.

Yuch3nE · Feb 23, 2012 · 2a6d799 · 2a6d799
1 parent 9218516
commit 2a6d799
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/source/public/mk/Makefile.qt4 b/source/public/mk/Makefile.qt4
@@ -25,7 +25,7 @@ INCLUDES += -I"$(QT4_INCLUDE)" \
             -I"$(QT4_INCLUDE)/QtGui" \
             -I"$(QT4_INCLUDE)/qtmain" \
             -I"$(OBJDIR)" \
-            -DQT_LARGEFILE_SUPPORT -DQT_CORE_LIB -DQT_GUI_LIB
+            -DQT_CORE_LIB -DQT_GUI_LIB
 
 ifdef IS_WIN
 RCFILES   =$(wildcard *.rc)
@@ -37,8 +37,10 @@ endif
 
 LIBS     += $(LIBPATHFLAG)"$(QT4_LIB)" \
             $(LIBFLAG)QtCore$(QTLIB_EXT) \
-            $(LIBFLAG)QtGui$(QTLIB_EXT) \
-            $(LIBFLAG)qtmain$(LIBEND)
+            $(LIBFLAG)QtGui$(QTLIB_EXT)
+ifdef IS_WIN
+LIBS     += $(LIBFLAG)qtmain$(LIBEND)
+endif
 
 UIFILES   =$(wildcard *.ui)
 UIHFILES  =$(addprefix $(OBJDIR)/ui_, $(UIFILES:.ui=.h))

diff --git a/source/uidemo/qtapp1/Makefile b/source/uidemo/qtapp1/Makefile
@@ -1,6 +1,6 @@
 ROOTDIR  =../../..
 PROJNAME =qtapp1
-APPTYPE  =qtconsole
+APPTYPE  =console
 
 include $(ROOTDIR)/config.mk
 

diff --git a/source/uidemo/qtapp2/Makefile b/source/uidemo/qtapp2/Makefile
@@ -1,7 +1,7 @@
 ROOTDIR  =../../..
 PKGNAME  =uidemo
 PROJNAME =qtapp2
-APPTYPE  =qtwin
+APPTYPE  =qt
 
 include $(ROOTDIR)/config.mk