# HG changeset patch
# User koda
# Date 1354614592 -3600
# Node ID 14d9a3c3365069a948c93b2dfdcb6b31df97a30b
# Parent  5e2dc5813408709c09c04595168bbc4f295eb156
backout rea7541f77944 since development of frontlib is on another branch

diff -r 5e2dc5813408 -r 14d9a3c33650 CMakeLists.txt
--- a/CMakeLists.txt	Tue Dec 04 10:17:16 2012 +0100
+++ b/CMakeLists.txt	Tue Dec 04 10:49:52 2012 +0100
@@ -261,9 +261,6 @@
 #physfs library
 add_subdirectory(misc/physfs)
 
-#frontend library
-add_subdirectory(project_files/frontlib)
-
 #Android related build scripts
 if(ANDROID)
     #run cmake -DANDROID=1 to enable this
diff -r 5e2dc5813408 -r 14d9a3c33650 QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt	Tue Dec 04 10:17:16 2012 +0100
+++ b/QTfrontend/CMakeLists.txt	Tue Dec 04 10:49:52 2012 +0100
@@ -38,7 +38,6 @@
 include_directories(${FFMPEG_INCLUDE_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/src)
 include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/extras)
-include_directories(${CMAKE_SOURCE_DIR}/project_files/frontlib)
 if(UNIX)
     # HACK: in freebsd cannot find iconv.h included via SDL.h
     include_directories("/usr/local/include")
@@ -178,11 +177,9 @@
 
 set(HW_LINK_LIBS
     physfs
-    frontlib
     ${QT_LIBRARIES}
     ${SDL_LIBRARY}
     ${SDLMIXER_LIBRARY}
-    ${SDLNET_LIBRARY}
     ${FFMPEG_LIBRARIES}
     ${HW_LINK_LIBS}
     )
diff -r 5e2dc5813408 -r 14d9a3c33650 QTfrontend/main.cpp
--- a/QTfrontend/main.cpp	Tue Dec 04 10:17:16 2012 +0100
+++ b/QTfrontend/main.cpp	Tue Dec 04 10:49:52 2012 +0100
@@ -35,8 +35,6 @@
 #include "DataManager.h"
 #include "FileEngine.h"
 
-#include "frontlib.h"
-
 #ifdef _WIN32
 #include <Shlobj.h>
 #endif
@@ -140,8 +138,6 @@
 
     FileEngineHandler engine(argv[0]);
 
-    flib_init();
-
     app.setAttribute(Qt::AA_DontShowIconsInMenus,false);
 
     QStringList arguments = app.arguments();
@@ -321,9 +317,5 @@
 
     app.form = new HWForm(NULL, style);
     app.form->show();
-    int r = app.exec();
-
-    flib_quit();
-
-    return r;
+    return app.exec();
 }
diff -r 5e2dc5813408 -r 14d9a3c33650 project_files/frontlib/frontlib.h
--- a/project_files/frontlib/frontlib.h	Tue Dec 04 10:17:16 2012 +0100
+++ b/project_files/frontlib/frontlib.h	Tue Dec 04 10:49:52 2012 +0100
@@ -26,10 +26,6 @@
 #ifndef FRONTLIB_H_
 #define FRONTLIB_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include "ipc/gameconn.h"
 #include "ipc/mapconn.h"
 #include "net/netconn.h"
@@ -49,8 +45,4 @@
  */
 void flib_quit();
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* FRONTLIB_H_ */
diff -r 5e2dc5813408 -r 14d9a3c33650 project_files/hedgewars.pro
--- a/project_files/hedgewars.pro	Tue Dec 04 10:17:16 2012 +0100
+++ b/project_files/hedgewars.pro	Tue Dec 04 10:49:52 2012 +0100
@@ -11,7 +11,6 @@
 INCLUDEPATH += ../QTfrontend/util
 INCLUDEPATH += ../misc/physfs/src
 INCLUDEPATH += ../misc/physfs/extras
-INCLUDEPATH += ../project_files/frontlib
 
 DESTDIR = ../bin
 
@@ -236,7 +235,7 @@
 
 RESOURCES += ../QTfrontend/hedgewars.qrc
 
-LIBS += -L../bin -lphysfs -lfrontlib
+LIBS += -L../bin -lphysfs
 
 macx {
     QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6