Mérification de la compilation sous win

mjc-ermont · Jun 29, 2014 · 0f27f4b · 0f27f4b
1 parent 66e5d53
commit 0f27f4b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 807 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-*.user
+*.user
+Makefile
diff --git a/Logger21.pro b/Logger21.pro
@@ -14,6 +14,7 @@ TEMPLATE = app
 
 QMAKE_CXXFLAGS += -std=c++0x
 
+ICON = icone.ico
 
 SOURCES += \
     FenPrincipale.cpp \
@@ -83,15 +84,7 @@ CONFIG += serialport
 
 QMAKE_CXXFLAGS_DEBUG += -O2 #Sinon ça faire l'erreur "too many sections"
 
-unix {
-    message(*nix detected)
-    LIBS += -lqwt
-    LIBS += -lqjson
-}
+message(*nix detected)
+LIBS += -lqwt
+LIBS += -lqjson
 
-win32 {
-    message(win32 detected)
-    LIBS += C:\Qwt-6.0.1\lib\libqwtd.a
-    LIBS += C:\qjson\lib\libqjson.dll.a
-    INCLUDEPATH += C:\Qwt-6.0.1\include C:\qjson\include
-}