Renamed main.cpp to ms_main.cpp so it doesn't conflict with the windo…

…ws build system. git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6259 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 15, 2006 · 46f5540 · 46f5540
1 parent 9732c51
commit 46f5540
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/tools/mapserver_export/mapserver_export.pro b/tools/mapserver_export/mapserver_export.pro
@@ -9,8 +9,9 @@ DEPENDPATH += .
 INCLUDEPATH += . $${PYTHONINCLUDE}
 LIBS += $${PYTHONLIBADD}
 LIBS += $${QGISCORELIBADD}
+LIBS += $${QGISGUILIBADD}
 QT += qt3support svg core gui xml network
 # Input
 HEADERS += qgsmapserverexport.h
 FORMS += qgsmapserverexportbase.ui
-SOURCES += main.cpp msexport_wrap.cxx qgsmapserverexport.cpp
+SOURCES += ms_main.cpp msexport_wrap.cxx qgsmapserverexport.cpp
diff --git a/tools/mapserver_export/main.cpp → tools/mapserver_export/ms_main.cpp b/tools/mapserver_export/main.cpp → tools/mapserver_export/ms_main.cpp