Permalink
Browse files

Using qmake now

  • Loading branch information...
1 parent 90e77b1 commit 9a89056fb5d395cc24ec55c328df688bbd701dec Amos Wenger committed Mar 3, 2011
Showing with 13 additions and 67 deletions.
  1. +2 −0 .gitignore
  2. +0 −66 Makefile
  3. +10 −0 rofl.pro
  4. +1 −1 source/main.cpp
View
@@ -1,2 +1,4 @@
bin/*
data/*
+Makefile
+.objects
View
@@ -1,66 +0,0 @@
-# Makefile for Irrlicht Examples
-# It's usually sufficient to change just the target name and source file list
-# and be sure that CXX is set to a valid compiler
-
-# Name of the executable created (.exe will be added automatically if necessary)
-Target := rofl
-# List of source files, separated by spaces
-Sources := source/main.cpp source/SKNLoader.cpp source/SKLLoader.cpp source/ddslib/DdsImage.cpp source/ddslib/s3tc.cpp
-# Path to Irrlicht directory, should contain include/ and lib/
-IrrlichtHome := ../irrlicht-1.7.2/
-# Path for the executable. Note that Irrlicht.dll should usually also be there for win32 systems
-BinPath = bin
-
-# general compiler settings (might need to be set when compiling the lib, too)
-# preprocessor flags, e.g. defines and include paths
-USERCPPFLAGS =
-# compiler flags such as optimization flags
-#USERCXXFLAGS = -O3 -ffast-math
-USERCXXFLAGS = -g -Wall
-# linker flags such as additional libraries and link paths
-USERLDFLAGS =
-
-####
-#no changes necessary below this line
-####
-
-CPPFLAGS = -I$(IrrlichtHome)/include -I/usr/X11R6/include $(USERCPPFLAGS)
-CXXFLAGS = $(USERCXXFLAGS)
-LDFLAGS = $(USERLDFLAGS)
-
-#default target is Linux
-all: all_linux
-
-# target specific settings
-all_linux all_win32 static_win32: LDFLAGS += -L$(IrrlichtHome)/lib/$(SYSTEM) -lIrrlicht
-all_linux: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lXext -lX11
-all_linux clean_linux: SYSTEM=Linux
-all_win32 clean_win32 static_win32: SYSTEM=Win32-gcc
-all_win32 clean_win32 static_win32: SUF=.exe
-static_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
-all_win32: LDFLAGS += -lopengl32 -lm
-static_win32: LDFLAGS += -lgdi32 -lwinspool -lcomdlg32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lopengl32
-# name of the binary - only valid for targets which set SYSTEM
-DESTPATH = $(BinPath)/$(Target)$(SUF)
-
-all_linux all_win32 static_win32:
- $(warning Building...)
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(Sources) -o $(DESTPATH) $(LDFLAGS)
-
-clean: clean_linux clean_win32
- $(warning Cleaning...)
-
-clean_linux clean_win32:
- @$(RM) $(DESTPATH)
-
-.PHONY: all all_win32 static_win32 clean clean_linux clean_win32
-
-#multilib handling
-ifeq ($(HOSTTYPE), x86_64)
-LIBSELECT=64
-endif
-#solaris real-time features
-ifeq ($(HOSTTYPE), sun4)
-LDFLAGS += -lrt
-endif
-
View
@@ -0,0 +1,10 @@
+CONFIG += qt
+
+SOURCES += source/main.cpp source/SKNLoader.cpp source/SKLLoader.cpp source/ddslib/DdsImage.cpp source/ddslib/s3tc.cpp
+INCLUDEPATH += ../irrlicht-1.7.2/include
+LIBS += -lIrrlicht
+
+TARGET = rofl
+DESTDIR = bin
+OBJECTS_DIR = .objects
+
View
@@ -60,7 +60,7 @@ int main() {
m.Lighting = false;
m.Thickness = 4.0;
m.setFlag(EMF_ZWRITE_ENABLE, false);
- SColor white = SColor(128, 128, 128, 255);
+ SColor white = SColor(128, 128, 128, 128);
while(device->run()) {
// Draw 3D objects

0 comments on commit 9a89056

Please sign in to comment.