Rtch/LibD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Allanis/LibD

Browse Source 
Conflicts:
	src/Main/Game.cpp
This commit is contained in:
Tamir Atias 2012-04-19 17:32:49 +03:00
commit 73c85f0be7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LibDQt/LibDQt.pro
View File

@ -8,7 +8,7 @@ LIBS += -lGL \
-ltinyxml \ -ltinyxml \
-lSDL_mixer \ -lSDL_mixer \
-lSDL_ttf -lSDL_ttf
win32: { win32: {
LIBS -= -lGL \ LIBS -= -lGL \
-lGLU -lGLU
LIBS += -lkernel32 \ LIBS += -lkernel32 \
@ -105,4 +105,4 @@ SOURCES += ../src/Actor/Player.cpp \
../src/Animation/AnimatingSprite.cpp \ ../src/Animation/AnimatingSprite.cpp \
../src/UI/Menu.cpp \ ../src/UI/Menu.cpp \
../src/UI/Button.cpp \ ../src/UI/Button.cpp \
../src/Main/TitleScreen.cpp ../src/Main/TitleScreen.cpp \

2
README
View File

@ -14,7 +14,7 @@ KonoM
################################################################## ##################################################################
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Copyright (C) 2011 SaraCraft Copyright (C) 2012 SaraCraft
allanis@saracraft.net allanis@saracraft.net
This program is free software; you can redistribute it and/or This program is free software; you can redistribute it and/or

2
src/Main/Game.cpp
View File

@ -32,7 +32,7 @@ Game::Game(void) {
_titleScreen = new TitleScreen(); _titleScreen = new TitleScreen();
_inTitleScreen = true; _inTitleScreen = true;
_inGameMenu = NULL; _inGameMenu = NULL;
_inGameMenuShown = false; _inGameMenuShown = false;