diff options
Diffstat (limited to 'aethyra.cbp')
| -rw-r--r-- | aethyra.cbp | 314 |
1 files changed, 312 insertions, 2 deletions
diff --git a/aethyra.cbp b/aethyra.cbp index bcd0398b..efc735c9 100644 --- a/aethyra.cbp +++ b/aethyra.cbp @@ -44,7 +44,7 @@ <Add option="-Wall" /> <Add option="-g" /> <Add option="`sdl-config --cflags`" /> - <Add directory="/usr/local/include/libxml2" /> + <Add directory="\usr\local\include\libxml2" /> </Compiler> <Linker> <Add option="`sdl-config --libs`" /> @@ -66,8 +66,9 @@ <Add alias="All" targets="default;" /> </VirtualTargets> <Compiler> - <Add directory="../../../../../../mingw/include/SDL" /> + <Add directory="..\..\..\..\..\..\mingw\include\SDL" /> </Compiler> +<<<<<<< HEAD:aethyra.cbp <Unit filename="src/animatedsprite.cpp" /> <Unit filename="src/animatedsprite.h" /> <Unit filename="src/animationparticle.cpp" /> @@ -373,7 +374,316 @@ <Unit filename="src/utils/xml.h" /> <Unit filename="src/winver.h"> <Option target="unix" /> +======= + <Unit filename="src\animatedsprite.cpp" /> + <Unit filename="src\animatedsprite.h" /> + <Unit filename="src\animationparticle.cpp" /> + <Unit filename="src\animationparticle.h" /> + <Unit filename="src\being.cpp" /> + <Unit filename="src\being.h" /> + <Unit filename="src\beingmanager.cpp" /> + <Unit filename="src\beingmanager.h" /> + <Unit filename="src\configlistener.h" /> + <Unit filename="src\configuration.cpp" /> + <Unit filename="src\configuration.h" /> + <Unit filename="src\engine.cpp" /> + <Unit filename="src\engine.h" /> + <Unit filename="src\equipment.cpp" /> + <Unit filename="src\equipment.h" /> + <Unit filename="src\floor_item.cpp" /> + <Unit filename="src\floor_item.h" /> + <Unit filename="src\flooritemmanager.cpp" /> + <Unit filename="src\flooritemmanager.h" /> + <Unit filename="src\game.cpp" /> + <Unit filename="src\game.h" /> + <Unit filename="src\graphics.cpp" /> + <Unit filename="src\graphics.h" /> + <Unit filename="src\gui\box.cpp" /> + <Unit filename="src\gui\box.h" /> + <Unit filename="src\gui\browserbox.cpp" /> + <Unit filename="src\gui\browserbox.h" /> + <Unit filename="src\gui\buddywindow.cpp" /> + <Unit filename="src\gui\buddywindow.h" /> + <Unit filename="src\gui\button.cpp" /> + <Unit filename="src\gui\button.h" /> + <Unit filename="src\gui\buy.cpp" /> + <Unit filename="src\gui\buy.h" /> + <Unit filename="src\gui\buysell.cpp" /> + <Unit filename="src\gui\buysell.h" /> + <Unit filename="src\gui\char_select.cpp" /> + <Unit filename="src\gui\char_select.h" /> + <Unit filename="src\gui\char_server.cpp" /> + <Unit filename="src\gui\char_server.h" /> + <Unit filename="src\gui\chargedialog.cpp" /> + <Unit filename="src\gui\chargedialog.h" /> + <Unit filename="src\gui\chat.cpp" /> + <Unit filename="src\gui\chat.h" /> + <Unit filename="src\gui\chatinput.cpp" /> + <Unit filename="src\gui\chatinput.h" /> + <Unit filename="src\gui\checkbox.cpp" /> + <Unit filename="src\gui\checkbox.h" /> + <Unit filename="src\gui\confirm_dialog.cpp" /> + <Unit filename="src\gui\confirm_dialog.h" /> + <Unit filename="src\gui\connection.cpp" /> + <Unit filename="src\gui\connection.h" /> + <Unit filename="src\gui\debugwindow.cpp" /> + <Unit filename="src\gui\debugwindow.h" /> + <Unit filename="src\gui\equipmentwindow.cpp" /> + <Unit filename="src\gui\equipmentwindow.h" /> + <Unit filename="src\gui\focushandler.cpp" /> + <Unit filename="src\gui\focushandler.h" /> + <Unit filename="src\gui\gccontainer.cpp" /> + <Unit filename="src\gui\gccontainer.h" /> + <Unit filename="src\gui\gui.cpp" /> + <Unit filename="src\gui\gui.h" /> + <Unit filename="src\gui\hbox.cpp" /> + <Unit filename="src\gui\hbox.h" /> + <Unit filename="src\gui\help.cpp" /> + <Unit filename="src\gui\help.h" /> + <Unit filename="src\gui\inttextbox.cpp" /> + <Unit filename="src\gui\inttextbox.h" /> + <Unit filename="src\gui\inventorywindow.cpp" /> + <Unit filename="src\gui\inventorywindow.h" /> + <Unit filename="src\gui\item_amount.cpp" /> + <Unit filename="src\gui\item_amount.h" /> + <Unit filename="src\gui\itemcontainer.cpp" /> + <Unit filename="src\gui\itemcontainer.h" /> + <Unit filename="src\gui\itemshortcutcontainer.cpp" /> + <Unit filename="src\gui\itemshortcutcontainer.h" /> + <Unit filename="src\gui\itemshortcutwindow.cpp" /> + <Unit filename="src\gui\itemshortcutwindow.h" /> + <Unit filename="src\gui\linkhandler.h" /> + <Unit filename="src\gui\listbox.cpp" /> + <Unit filename="src\gui\listbox.h" /> + <Unit filename="src\gui\login.cpp" /> + <Unit filename="src\gui\login.h" /> + <Unit filename="src\gui\menuwindow.cpp" /> + <Unit filename="src\gui\menuwindow.h" /> + <Unit filename="src\gui\minimap.cpp" /> + <Unit filename="src\gui\minimap.h" /> + <Unit filename="src\gui\ministatus.cpp" /> + <Unit filename="src\gui\ministatus.h" /> + <Unit filename="src\gui\newskill.cpp" /> + <Unit filename="src\gui\newskill.h" /> + <Unit filename="src\gui\npc_text.cpp" /> + <Unit filename="src\gui\npc_text.h" /> + <Unit filename="src\gui\npclistdialog.cpp" /> + <Unit filename="src\gui\npclistdialog.h" /> + <Unit filename="src\gui\ok_dialog.cpp" /> + <Unit filename="src\gui\ok_dialog.h" /> + <Unit filename="src\gui\passwordfield.cpp" /> + <Unit filename="src\gui\passwordfield.h" /> + <Unit filename="src\gui\playerbox.cpp" /> + <Unit filename="src\gui\playerbox.h" /> + <Unit filename="src\gui\popupmenu.cpp" /> + <Unit filename="src\gui\popupmenu.h" /> + <Unit filename="src\gui\progressbar.cpp" /> + <Unit filename="src\gui\progressbar.h" /> + <Unit filename="src\gui\radiobutton.cpp" /> + <Unit filename="src\gui\radiobutton.h" /> + <Unit filename="src\gui\register.cpp" /> + <Unit filename="src\gui\register.h" /> + <Unit filename="src\gui\scrollarea.cpp" /> + <Unit filename="src\gui\scrollarea.h" /> + <Unit filename="src\gui\selectionlistener.h" /> + <Unit filename="src\gui\sell.cpp" /> + <Unit filename="src\gui\sell.h" /> + <Unit filename="src\gui\setup.cpp" /> + <Unit filename="src\gui\setup.h" /> + <Unit filename="src\gui\setup_audio.cpp" /> + <Unit filename="src\gui\setup_audio.h" /> + <Unit filename="src\gui\setup_joystick.cpp" /> + <Unit filename="src\gui\setup_joystick.h" /> + <Unit filename="src\gui\setup_keyboard.cpp" /> + <Unit filename="src\gui\setup_keyboard.h" /> + <Unit filename="src\gui\setup_players.cpp" /> + <Unit filename="src\gui\setup_players.h" /> + <Unit filename="src\gui\setup_video.cpp" /> + <Unit filename="src\gui\setup_video.h" /> + <Unit filename="src\gui\setuptab.h" /> + <Unit filename="src\gui\shop.cpp" /> + <Unit filename="src\gui\shop.h" /> + <Unit filename="src\gui\shoplistbox.cpp" /> + <Unit filename="src\gui\shoplistbox.h" /> + <Unit filename="src\gui\skill.cpp" /> + <Unit filename="src\gui\skill.h" /> + <Unit filename="src\gui\slider.cpp" /> + <Unit filename="src\gui\slider.h" /> + <Unit filename="src\gui\status.cpp" /> + <Unit filename="src\gui\status.h" /> + <Unit filename="src\gui\tabbedcontainer.cpp" /> + <Unit filename="src\gui\tabbedcontainer.h" /> + <Unit filename="src\gui\table.cpp" /> + <Unit filename="src\gui\table.h" /> + <Unit filename="src\gui\table_model.cpp" /> + <Unit filename="src\gui\table_model.h" /> + <Unit filename="src\gui\textbox.cpp" /> + <Unit filename="src\gui\textbox.h" /> + <Unit filename="src\gui\textfield.cpp" /> + <Unit filename="src\gui\textfield.h" /> + <Unit filename="src\gui\trade.cpp" /> + <Unit filename="src\gui\trade.h" /> + <Unit filename="src\gui\updatewindow.cpp" /> + <Unit filename="src\gui\updatewindow.h" /> + <Unit filename="src\gui\vbox.cpp" /> + <Unit filename="src\gui\vbox.h" /> + <Unit filename="src\gui\viewport.cpp" /> + <Unit filename="src\gui\viewport.h" /> + <Unit filename="src\gui\widgets\resizegrip.cpp" /> + <Unit filename="src\gui\widgets\resizegrip.h" /> + <Unit filename="src\gui\window.cpp" /> + <Unit filename="src\gui\window.h" /> + <Unit filename="src\gui\windowcontainer.cpp" /> + <Unit filename="src\gui\windowcontainer.h" /> + <Unit filename="src\guichanfwd.h" /> + <Unit filename="src\imageparticle.cpp" /> + <Unit filename="src\imageparticle.h" /> + <Unit filename="src\inventory.cpp" /> + <Unit filename="src\inventory.h" /> + <Unit filename="src\item.cpp" /> + <Unit filename="src\item.h" /> + <Unit filename="src\itemshortcut.cpp" /> + <Unit filename="src\itemshortcut.h" /> + <Unit filename="src\joystick.cpp" /> + <Unit filename="src\joystick.h" /> + <Unit filename="src\keyboardconfig.cpp" /> + <Unit filename="src\keyboardconfig.h" /> + <Unit filename="src\localplayer.cpp" /> + <Unit filename="src\localplayer.h" /> + <Unit filename="src\lockedarray.h" /> + <Unit filename="src\log.cpp" /> + <Unit filename="src\log.h" /> + <Unit filename="src\logindata.h" /> + <Unit filename="src\main.cpp" /> + <Unit filename="src\main.h" /> + <Unit filename="src\map.cpp" /> + <Unit filename="src\map.h" /> + <Unit filename="src\monster.cpp" /> + <Unit filename="src\monster.h" /> + <Unit filename="src\net\beinghandler.cpp" /> + <Unit filename="src\net\beinghandler.h" /> + <Unit filename="src\net\buysellhandler.cpp" /> + <Unit filename="src\net\buysellhandler.h" /> + <Unit filename="src\net\charserverhandler.cpp" /> + <Unit filename="src\net\charserverhandler.h" /> + <Unit filename="src\net\chathandler.cpp" /> + <Unit filename="src\net\chathandler.h" /> + <Unit filename="src\net\equipmenthandler.cpp" /> + <Unit filename="src\net\equipmenthandler.h" /> + <Unit filename="src\net\inventoryhandler.cpp" /> + <Unit filename="src\net\inventoryhandler.h" /> + <Unit filename="src\net\itemhandler.cpp" /> + <Unit filename="src\net\itemhandler.h" /> + <Unit filename="src\net\loginhandler.cpp" /> + <Unit filename="src\net\loginhandler.h" /> + <Unit filename="src\net\maploginhandler.cpp" /> + <Unit filename="src\net\maploginhandler.h" /> + <Unit filename="src\net\messagehandler.cpp" /> + <Unit filename="src\net\messagehandler.h" /> + <Unit filename="src\net\messagein.cpp" /> + <Unit filename="src\net\messagein.h" /> + <Unit filename="src\net\messageout.cpp" /> + <Unit filename="src\net\messageout.h" /> + <Unit filename="src\net\network.cpp" /> + <Unit filename="src\net\network.h" /> + <Unit filename="src\net\npchandler.cpp" /> + <Unit filename="src\net\npchandler.h" /> + <Unit filename="src\net\packet.h" /> + <Unit filename="src\net\playerhandler.cpp" /> + <Unit filename="src\net\playerhandler.h" /> + <Unit filename="src\net\protocol.cpp" /> + <Unit filename="src\net\protocol.h" /> + <Unit filename="src\net\skillhandler.cpp" /> + <Unit filename="src\net\skillhandler.h" /> + <Unit filename="src\net\tradehandler.cpp" /> + <Unit filename="src\net\tradehandler.h" /> + <Unit filename="src\npc.cpp" /> + <Unit filename="src\npc.h" /> + <Unit filename="src\openglgraphics.cpp" /> + <Unit filename="src\openglgraphics.h" /> + <Unit filename="src\particle.cpp" /> + <Unit filename="src\particle.h" /> + <Unit filename="src\particleemitter.cpp" /> + <Unit filename="src\particleemitter.h" /> + <Unit filename="src\particleemitterprop.h" /> + <Unit filename="src\player.cpp" /> + <Unit filename="src\player.h" /> + <Unit filename="src\player_relations.cpp" /> + <Unit filename="src\player_relations.h" /> + <Unit filename="src\properties.h" /> + <Unit filename="src\resources\action.cpp" /> + <Unit filename="src\resources\action.h" /> + <Unit filename="src\resources\ambientoverlay.cpp" /> + <Unit filename="src\resources\ambientoverlay.h" /> + <Unit filename="src\resources\animation.cpp" /> + <Unit filename="src\resources\animation.h" /> + <Unit filename="src\resources\buddylist.cpp" /> + <Unit filename="src\resources\buddylist.h" /> + <Unit filename="src\resources\dye.cpp" /> + <Unit filename="src\resources\dye.h" /> + <Unit filename="src\resources\image.cpp" /> + <Unit filename="src\resources\image.h" /> + <Unit filename="src\resources\imageloader.cpp" /> + <Unit filename="src\resources\imageloader.h" /> + <Unit filename="src\resources\imageset.cpp" /> + <Unit filename="src\resources\imageset.h" /> + <Unit filename="src\resources\imagewriter.cpp" /> + <Unit filename="src\resources\imagewriter.h" /> + <Unit filename="src\resources\itemdb.cpp" /> + <Unit filename="src\resources\itemdb.h" /> + <Unit filename="src\resources\iteminfo.cpp" /> + <Unit filename="src\resources\iteminfo.h" /> + <Unit filename="src\resources\mapreader.cpp" /> + <Unit filename="src\resources\mapreader.h" /> + <Unit filename="src\resources\monsterdb.cpp" /> + <Unit filename="src\resources\monsterdb.h" /> + <Unit filename="src\resources\monsterinfo.cpp" /> + <Unit filename="src\resources\monsterinfo.h" /> + <Unit filename="src\resources\music.cpp" /> + <Unit filename="src\resources\music.h" /> + <Unit filename="src\resources\npcdb.cpp" /> + <Unit filename="src\resources\npcdb.h" /> + <Unit filename="src\resources\resource.cpp" /> + <Unit filename="src\resources\resource.h" /> + <Unit filename="src\resources\resourcemanager.cpp" /> + <Unit filename="src\resources\resourcemanager.h" /> + <Unit filename="src\resources\soundeffect.cpp" /> + <Unit filename="src\resources\soundeffect.h" /> + <Unit filename="src\resources\spritedef.cpp" /> + <Unit filename="src\resources\spritedef.h" /> + <Unit filename="src\serverinfo.h" /> + <Unit filename="src\shopitem.cpp" /> + <Unit filename="src\shopitem.h" /> + <Unit filename="src\simpleanimation.cpp" /> + <Unit filename="src\simpleanimation.h" /> + <Unit filename="src\sound.cpp" /> + <Unit filename="src\sound.h" /> + <Unit filename="src\sprite.h" /> + <Unit filename="src\text.cpp" /> + <Unit filename="src\text.h" /> + <Unit filename="src\textmanager.cpp" /> + <Unit filename="src\textmanager.h" /> + <Unit filename="src\textparticle.cpp" /> + <Unit filename="src\textparticle.h" /> + <Unit filename="src\tileset.h" /> + <Unit filename="src\tmw.rc"> + <Option compilerVar="CPP" /> +>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:tmw.cbp </Unit> + <Unit filename="src\utils\base64.cpp" /> + <Unit filename="src\utils\base64.h" /> + <Unit filename="src\utils\colorconversion.cpp" /> + <Unit filename="src\utils\colorconversion.h" /> + <Unit filename="src\utils\dtor.h" /> + <Unit filename="src\utils\fastsqrt.h" /> + <Unit filename="src\utils\strprintf.cpp" /> + <Unit filename="src\utils\strprintf.h" /> + <Unit filename="src\utils\tostring.h" /> + <Unit filename="src\utils\trim.h" /> + <Unit filename="src\utils\xml.cpp" /> + <Unit filename="src\utils\xml.h" /> + <Unit filename="src\vector.h" /> + <Unit filename="src\winver.h" /> <Extensions> <code_completion /> <envvars /> |