]> ruin.nu Git - eonsl.git/commitdiff
projects / eonsl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ef1cf5c)
The makefile linked wrong, just some cleanup..
authorMichael Andreen <harv@ruin.nu>
Wed, 27 Dec 2000 21:21:50 +0000 (21:21 +0000)
committerMichael Andreen <harv@ruin.nu>
Wed, 27 Dec 2000 21:21:50 +0000 (21:21 +0000)
Makefile patch | blob | history
eonslp.pro patch | blob | history

diff --git a/Makefile b/Makefile
index 2fa91e964a160af4c71e014614f1e5e8139acb87..cb94a52a86f31cdf0b61be66b424be17c1cab48d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building eonslp
 #############################################################################
 # Makefile for building eonslp
-# Generated by tmake at 19:38, 2000/12/27
+# Generated by tmake at 22:03, 2000/12/27
 #     Project: eonslp
 #    Template: app
 #############################################################################
 #     Project: eonslp
 #    Template: app
 #############################################################################
@@ -9,8 +9,8 @@
 
 CC     =       gcc
 CXX    =       g++
 
 CC     =       gcc
 CXX    =       g++
-CFLAGS =       -pipe -Wall -W -g3
-CXXFLAGS=      -pipe -Wall -W -g3
+CFLAGS =       -pipe -Wall -W -O2 -DNO_DEBUG
+CXXFLAGS=      -pipe -Wall -W -O2 -DNO_DEBUG
 INCPATH        =       -I$(QTDIR)/include
 LINK   =       g++
 LFLAGS =       
 INCPATH        =       -I$(QTDIR)/include
 LINK   =       g++
 LFLAGS =       
@@ -18,19 +18,18 @@ LIBS        =       $(SUBLIBS) -L$(QTDIR)/lib -L/usr/X11R6/lib -lqt -lXext -lX11 -lm
 MOC    =       $(QTDIR)/bin/moc
 UIC    =       $(QTDIR)/bin/uic
 
 MOC    =       $(QTDIR)/bin/moc
 UIC    =       $(QTDIR)/bin/uic
 
+TARGET= eonslp
 TAR    =       tar -cf
 GZIP   =       gzip -9f
 
 ####### Files
 
 TAR    =       tar -cf
 GZIP   =       gzip -9f
 
 ####### Files
 
-HEADERS =      eonsl/ccreature.h \
+HEADERS =      config.h \
+               eonsl/ccreature.h \
                eonsl/eonsl.h \
                eonsl/eonsldoc.h \
                eonsl/eonslview.h \
                eonsl/eonsl.h \
                eonsl/eonsldoc.h \
                eonsl/eonslview.h \
-               eonsl/resource.h \
-               eonsl/widgets/attack.h \
-               eonsl/widgets/closeweapon.h \
-               eonsl/widgets/coin.h
+               eonsl/resource.h
 SOURCES =      eonsl/ccreature.cpp \
                eonsl/eonsl.cpp \
                eonsl/eonsldoc.cpp \
 SOURCES =      eonsl/ccreature.cpp \
                eonsl/eonsl.cpp \
                eonsl/eonsldoc.cpp \
@@ -88,9 +87,6 @@ SRCMOC        =       eonsl/moc_ccreature.cpp \
                eonsl/widgets/moc_attack.cpp \
                eonsl/widgets/moc_closeweapon.cpp \
                eonsl/widgets/moc_coin.cpp \
                eonsl/widgets/moc_attack.cpp \
                eonsl/widgets/moc_closeweapon.cpp \
                eonsl/widgets/moc_coin.cpp \
-               eonsl/widgets/moc_attack.cpp \
-               eonsl/widgets/moc_closeweapon.cpp \
-               eonsl/widgets/moc_coin.cpp \
                eonsl/widgets/moc_creatureedit.cpp \
                eonsl/widgets/moc_equipment.cpp \
                eonsl/widgets/moc_item.cpp \
                eonsl/widgets/moc_creatureedit.cpp \
                eonsl/widgets/moc_equipment.cpp \
                eonsl/widgets/moc_item.cpp \
@@ -105,9 +101,6 @@ OBJMOC      =       eonsl/moc_ccreature.o \
                eonsl/widgets/moc_attack.o \
                eonsl/widgets/moc_closeweapon.o \
                eonsl/widgets/moc_coin.o \
                eonsl/widgets/moc_attack.o \
                eonsl/widgets/moc_closeweapon.o \
                eonsl/widgets/moc_coin.o \
-               eonsl/widgets/moc_attack.o \
-               eonsl/widgets/moc_closeweapon.o \
-               eonsl/widgets/moc_coin.o \
                eonsl/widgets/moc_creatureedit.o \
                eonsl/widgets/moc_equipment.o \
                eonsl/widgets/moc_item.o \
                eonsl/widgets/moc_creatureedit.o \
                eonsl/widgets/moc_equipment.o \
                eonsl/widgets/moc_item.o \
@@ -176,6 +169,7 @@ eonsl/eonsl.o: eonsl/eonsl.cpp \
                eonsl/eonslview.h \
                eonsl/eonsldoc.h \
                eonsl/resource.h \
                eonsl/eonslview.h \
                eonsl/eonsldoc.h \
                eonsl/resource.h \
+               eonsl/../config.h \
                eonsl/filesave.xpm \
                eonsl/fileopen.xpm \
                eonsl/filenew.xpm
                eonsl/filesave.xpm \
                eonsl/fileopen.xpm \
                eonsl/filenew.xpm
@@ -191,7 +185,8 @@ eonsl/main.o: eonsl/main.cpp \
                eonsl/eonsl.h \
                eonsl/eonslview.h \
                eonsl/eonsldoc.h \
                eonsl/eonsl.h \
                eonsl/eonslview.h \
                eonsl/eonsldoc.h \
-               eonsl/resource.h
+               eonsl/resource.h \
+               eonsl/../config.h
 
 eonsl/widgets/attack.h: eonsl/widgets/attack.ui
        $(UIC) eonsl/widgets/attack.ui -o eonsl/widgets/attack.h
 
 eonsl/widgets/attack.h: eonsl/widgets/attack.ui
        $(UIC) eonsl/widgets/attack.ui -o eonsl/widgets/attack.h
@@ -283,25 +278,35 @@ war.h: eonsl/widgets/war.ui
 eonsl/widgets/war.cpp: eonsl/widgets/war.ui
        $(UIC) eonsl/widgets/war.ui -i war.h -o eonsl/widgets/war.cpp
 
 eonsl/widgets/war.cpp: eonsl/widgets/war.ui
        $(UIC) eonsl/widgets/war.ui -i war.h -o eonsl/widgets/war.cpp
 
-eonsl/widgets/attack.o: eonsl/widgets/attack.cpp
+eonsl/widgets/attack.o: eonsl/widgets/attack.cpp \
+               eonsl/widgets/attack.h
 
 
-eonsl/widgets/closeweapon.o: eonsl/widgets/closeweapon.cpp
+eonsl/widgets/closeweapon.o: eonsl/widgets/closeweapon.cpp \
+               eonsl/widgets/closeweapon.h
 
 
-eonsl/widgets/coin.o: eonsl/widgets/coin.cpp
+eonsl/widgets/coin.o: eonsl/widgets/coin.cpp \
+               eonsl/widgets/coin.h
 
 
-eonsl/widgets/creatureedit.o: eonsl/widgets/creatureedit.cpp
+eonsl/widgets/creatureedit.o: eonsl/widgets/creatureedit.cpp \
+               eonsl/widgets/creatureedit.h
 
 
-eonsl/widgets/equipment.o: eonsl/widgets/equipment.cpp
+eonsl/widgets/equipment.o: eonsl/widgets/equipment.cpp \
+               eonsl/widgets/equipment.h
 
 
-eonsl/widgets/item.o: eonsl/widgets/item.cpp
+eonsl/widgets/item.o: eonsl/widgets/item.cpp \
+               eonsl/widgets/item.h
 
 
-eonsl/widgets/rangeweapon.o: eonsl/widgets/rangeweapon.cpp
+eonsl/widgets/rangeweapon.o: eonsl/widgets/rangeweapon.cpp \
+               eonsl/widgets/rangeweapon.h
 
 
-eonsl/widgets/shield.o: eonsl/widgets/shield.cpp
+eonsl/widgets/shield.o: eonsl/widgets/shield.cpp \
+               eonsl/widgets/shield.h
 
 
-eonsl/widgets/skilldialog.o: eonsl/widgets/skilldialog.cpp
+eonsl/widgets/skilldialog.o: eonsl/widgets/skilldialog.cpp \
+               eonsl/widgets/skilldialog.h
 
 
-eonsl/widgets/war.o: eonsl/widgets/war.cpp
+eonsl/widgets/war.o: eonsl/widgets/war.cpp \
+               eonsl/widgets/war.h
 
 eonsl/moc_ccreature.o: eonsl/moc_ccreature.cpp \
                eonsl/ccreature.h
 
 eonsl/moc_ccreature.o: eonsl/moc_ccreature.cpp \
                eonsl/ccreature.h
@@ -310,7 +315,8 @@ eonsl/moc_eonsl.o: eonsl/moc_eonsl.cpp \
                eonsl/eonsl.h \
                eonsl/eonslview.h \
                eonsl/eonsldoc.h \
                eonsl/eonsl.h \
                eonsl/eonslview.h \
                eonsl/eonsldoc.h \
-               eonsl/resource.h
+               eonsl/resource.h \
+               eonsl/../config.h
 
 eonsl/moc_eonsldoc.o: eonsl/moc_eonsldoc.cpp \
                eonsl/eonsldoc.h
 
 eonsl/moc_eonsldoc.o: eonsl/moc_eonsldoc.cpp \
                eonsl/eonsldoc.h
@@ -328,15 +334,6 @@ eonsl/widgets/moc_closeweapon.o: eonsl/widgets/moc_closeweapon.cpp \
 eonsl/widgets/moc_coin.o: eonsl/widgets/moc_coin.cpp \
                eonsl/widgets/coin.h
 
 eonsl/widgets/moc_coin.o: eonsl/widgets/moc_coin.cpp \
                eonsl/widgets/coin.h
 
-eonsl/widgets/moc_attack.o: eonsl/widgets/moc_attack.cpp \
-               eonsl/widgets/attack.h
-
-eonsl/widgets/moc_closeweapon.o: eonsl/widgets/moc_closeweapon.cpp \
-               eonsl/widgets/closeweapon.h
-
-eonsl/widgets/moc_coin.o: eonsl/widgets/moc_coin.cpp \
-               eonsl/widgets/coin.h
-
 eonsl/widgets/moc_creatureedit.o: eonsl/widgets/moc_creatureedit.cpp \
                eonsl/widgets/creatureedit.h
 
 eonsl/widgets/moc_creatureedit.o: eonsl/widgets/moc_creatureedit.cpp \
                eonsl/widgets/creatureedit.h
 
@@ -379,15 +376,6 @@ eonsl/widgets/moc_closeweapon.cpp: eonsl/widgets/closeweapon.h
 eonsl/widgets/moc_coin.cpp: eonsl/widgets/coin.h
        $(MOC) eonsl/widgets/coin.h -o eonsl/widgets/moc_coin.cpp
 
 eonsl/widgets/moc_coin.cpp: eonsl/widgets/coin.h
        $(MOC) eonsl/widgets/coin.h -o eonsl/widgets/moc_coin.cpp
 
-eonsl/widgets/moc_attack.cpp: eonsl/widgets/attack.h
-       $(MOC) eonsl/widgets/attack.h -o eonsl/widgets/moc_attack.cpp
-
-eonsl/widgets/moc_closeweapon.cpp: eonsl/widgets/closeweapon.h
-       $(MOC) eonsl/widgets/closeweapon.h -o eonsl/widgets/moc_closeweapon.cpp
-
-eonsl/widgets/moc_coin.cpp: eonsl/widgets/coin.h
-       $(MOC) eonsl/widgets/coin.h -o eonsl/widgets/moc_coin.cpp
-
 eonsl/widgets/moc_creatureedit.cpp: eonsl/widgets/creatureedit.h
        $(MOC) eonsl/widgets/creatureedit.h -o eonsl/widgets/moc_creatureedit.cpp
 
 eonsl/widgets/moc_creatureedit.cpp: eonsl/widgets/creatureedit.h
        $(MOC) eonsl/widgets/creatureedit.h -o eonsl/widgets/moc_creatureedit.cpp
 
diff --git a/eonslp.pro b/eonslp.pro
index 9de25c92940275f73d3b6a09d60794f7831a0930..d4fcc867ea4fc07d6c9d94668dbdd848c4675ee4 100644 (file)
--- a/eonslp.pro
+++ b/eonslp.pro
@@ -1,13 +1,11 @@
 TEMPLATE       = app
 TEMPLATE       = app
-CONFIG         = qt warn_on debug
-HEADERS                = eonsl/ccreature.h \
+CONFIG         = qt warn_on release
+HEADERS                = config.h \
+                 eonsl/ccreature.h \
                  eonsl/eonsl.h \
                  eonsl/eonsldoc.h \
                  eonsl/eonslview.h \
                  eonsl/eonsl.h \
                  eonsl/eonsldoc.h \
                  eonsl/eonslview.h \
-                 eonsl/resource.h \
-                 eonsl/widgets/attack.h \
-                 eonsl/widgets/closeweapon.h \
-                 eonsl/widgets/coin.h
+                 eonsl/resource.h
 SOURCES                = eonsl/ccreature.cpp \
                  eonsl/eonsl.cpp \
                  eonsl/eonsldoc.cpp \
 SOURCES                = eonsl/ccreature.cpp \
                  eonsl/eonsl.cpp \
                  eonsl/eonsldoc.cpp \
A not-finished storytell help for the swedish pen-and-paper rpg Eon.