Permalink
Browse files

make cmake suck less

  • Loading branch information...
1 parent 07dff3d commit d8dcd9b6492c766dac1b17fb4c4bc1818976dfac @Justasic Justasic committed Apr 7, 2012
Showing with 192 additions and 162 deletions.
  1. +10 −0 .gitignore
  2. +3 −0 CMakeLists.txt
  3. 0 {src → include}/chat.h
  4. 0 {src → include}/chunkmap.h
  5. 0 {src → include}/cliScreen.h
  6. 0 {src → include}/config.h
  7. +17 −0 include/configure.h
  8. 0 {src → include}/constants.h
  9. 0 {src → include}/constants_num.h
  10. 0 {src → include}/furnace.h
  11. 0 {src → include}/furnaceManager.h
  12. 0 {src → include}/hook.h
  13. 0 {src → include}/inventory.h
  14. 0 {src → include}/lighting.h
  15. 0 {src → include}/logger.h
  16. 0 {src → include}/logtype.h
  17. 0 {src → include}/map.h
  18. 0 {src → include}/mcregion.h
  19. 0 {src → include}/metadata.h
  20. 0 {src → include}/mineserver.h
  21. 0 {src → include}/mob.h
  22. 0 {src → include}/nbt.h
  23. 0 {src → include}/packets.h
  24. 0 {src → include}/permissions.h
  25. 0 {src → include}/physics.h
  26. 0 {src → include}/plugin.h
  27. 0 {src → include}/plugin_api.h
  28. 0 {src → include}/protocol.h
  29. 0 {src → include}/random.h
  30. 0 {src → include}/screenBase.h
  31. 0 {src → include}/sockets.h
  32. 0 {src → include}/tools.h
  33. 0 {src → include}/tr1.h
  34. 0 {src → include}/tree.h
  35. 0 {src → include}/user.h
  36. 0 {src → include}/utf8.h
  37. 0 {src → include}/vec.h
  38. +1 −1 plugins/binlog/binlog.cpp
  39. +1 −1 plugins/binlog/binlog.h
  40. +1 −1 plugins/commands/commands.cpp
  41. +1 −1 plugins/crapMobs/crapMobs.cpp
  42. +2 −2 plugins/cursesui/screen.cpp
  43. +1 −1 plugins/cursesui/screen.h
  44. +2 −2 plugins/filelog/filelog.cpp
  45. +1 −1 plugins/flatpermissions/flatpermissions.cpp
  46. +1 −1 plugins/nBreak/nBreak.cpp
  47. +1 −1 plugins/nether/nether.cpp
  48. +2 −2 plugins/passiveMobs/passiveMobs.cpp
  49. +3 −3 src/blocks/basic.cpp
  50. +1 −1 src/blocks/basic.h
  51. +2 −2 src/blocks/bed.cpp
  52. +3 −3 src/blocks/blockfurnace.cpp
  53. +3 −3 src/blocks/cake.cpp
  54. +7 −7 src/blocks/chest.cpp
  55. +1 −1 src/blocks/chest.h
  56. +2 −2 src/blocks/default.cpp
  57. +3 −3 src/blocks/door.cpp
  58. +5 −5 src/blocks/falling.cpp
  59. +1 −1 src/blocks/falling.h
  60. +2 −2 src/blocks/fire.cpp
  61. +3 −3 src/blocks/ice.cpp
  62. +2 −2 src/blocks/jackolantern.cpp
  63. +2 −2 src/blocks/ladder.cpp
  64. +4 −4 src/blocks/leaves.cpp
  65. +3 −3 src/blocks/liquid.cpp
  66. +2 −2 src/blocks/note.cpp
  67. +3 −3 src/blocks/plant.cpp
  68. +1 −1 src/blocks/plant.h
  69. +2 −2 src/blocks/pumpkin.cpp
  70. +3 −3 src/blocks/redstone.cpp
  71. +2 −2 src/blocks/sign.cpp
  72. +2 −2 src/blocks/snow.cpp
  73. +2 −2 src/blocks/stair.cpp
  74. +2 −2 src/blocks/step.cpp
  75. +4 −4 src/blocks/tnt.cpp
  76. +2 −2 src/blocks/torch.cpp
  77. +3 −3 src/blocks/tracks.cpp
  78. +2 −2 src/blocks/wood.cpp
  79. +2 −2 src/blocks/wool.cpp
  80. +2 −2 src/blocks/workbench.cpp
  81. +1 −1 src/config/lexer.h
  82. +1 −1 src/config/node.h
  83. +1 −1 src/config/parser.cpp
  84. +1 −1 src/config/parser.h
  85. +1 −1 src/items/food.cpp
  86. +2 −2 src/items/food.h
  87. +3 −3 src/items/itembasic.cpp
  88. +3 −3 src/items/itembasic.h
  89. +3 −3 src/items/projectile.cpp
  90. +2 −2 src/items/projectile.h
  91. +1 −1 src/plugins/PyScript/PyScript.cpp
  92. +1 −1 src/plugins/PyScript/PyScript.h
  93. +1 −1 src/plugins/PyScript/python_plugin_api.h
  94. +2 −2 src/plugins/banlist/banlist.h
  95. +2 −2 src/plugins/command/command.h
  96. +4 −4 src/worldgen/biomegen.cpp
  97. +6 −6 src/worldgen/cavegen.cpp
  98. +6 −6 src/worldgen/eximgen.cpp
  99. +10 −10 src/worldgen/heavengen.cpp
  100. +5 −5 src/worldgen/mapgen.cpp
  101. +1 −1 src/worldgen/mapgen.h
  102. +10 −10 src/worldgen/nethergen.cpp
View
@@ -0,0 +1,10 @@
+# ignore kate temp files
+*~
+
+# ignore cmake crap
+CMakeFiles
+CMakeCache.txt
+src/configure.h
+
+# ignore our compile directory
+bin
View
@@ -44,6 +44,9 @@ SET(CONFIG_DIR_DISTSOURCE files)
# preprocess configuration file
CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/configure.h.in ${PROJECT_SOURCE_DIR}/src/configure.h)
+# Include directory
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/include)
+
# Output paths
SET(EXECUTABLE_OUTPUT_PATH bin)
SET(LIBRARY_OUTPUT_PATH bin)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -0,0 +1,17 @@
+//
+// defines provided by configuration (cmake)
+//
+
+#ifndef _CONFIGURE_H
+#define _CONFIGURE_H
+
+
+// directory names
+#define CONFIG_DIR_BIN "bin/"
+#define CONFIG_DIR_ETC "etc/mineserver/"
+#define CONFIG_DIR_LIB "lib/mineserver/"
+#define CONFIG_DIR_SHARE "./"
+#define CONFIG_DIR_DISTSOURCE "files"
+
+
+#endif // _CONFIGURE_H
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -37,7 +37,7 @@
#include <ctime>
#include <vector>
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#include "binlog.h"
Binlog::Binlog (std::string filename)
View
@@ -33,7 +33,7 @@
#include <fstream>
#include <time.h>
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#ifndef _BINLOG_H
#define _BINLOG_H
@@ -39,7 +39,7 @@
#include TR1INCLUDE(memory)
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#include "commands.h"
@@ -44,7 +44,7 @@ copy nether.so to Mineserver bin directory.
#include <math.h>
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#include "crapMobs.h"
@@ -27,10 +27,10 @@
#include "screen.h"
-#include "../../src/logtype.h"
+#include "logtype.h"
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#include <cstdlib>
#include <ctime>
@@ -40,7 +40,7 @@
#include <vector>
#include <stack>
-#include "../../src/logtype.h"
+#include "logtype.h"
enum
{
TEXT_COLOR_RED = 1,
@@ -55,9 +55,9 @@
#include <cstring>
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
-// This should mirror mineserver/src/logtype.h.
+// This should mirror mineserver/logtype.h.
static const char* logTypeName[] = {
"EMERG",
"Alert",
@@ -39,7 +39,7 @@ g++ -shared flatpermissions.o -o flatpermissions.so
#include <fstream>
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#define PLUGIN_VERSION 1.0
mineserver_pointer_struct* mineserver;
@@ -44,7 +44,7 @@ copy nether.so to Mineserver bin directory.
#include <math.h>
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#include "nBreak.h"
@@ -43,7 +43,7 @@ copy nether.so to Mineserver bin directory.
#include <cmath>
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
+#include "plugin_api.h"
#include "nether.h"
@@ -42,8 +42,8 @@
#define MINESERVER_C_API
-#include "../../src/plugin_api.h"
-#include "../../src/tools.h"
+#include "plugin_api.h"
+#include "tools.h"
#include "passiveMobs.h"
View
@@ -28,9 +28,9 @@
#include <cmath>
#include <cstdlib>
-#include "../mineserver.h"
-#include "../plugin.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "plugin.h"
+#include "map.h"
#include "basic.h"
View
@@ -31,7 +31,7 @@
#include <stdint.h>
#include <string>
-#include "../constants.h"
+#include "constants.h"
class User;
View
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "map.h"
#include "bed.h"
@@ -25,9 +25,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
-#include "../tools.h"
+#include "mineserver.h"
+#include "map.h"
+#include "tools.h"
#include "blockfurnace.h"
View
@@ -25,9 +25,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
-#include "../packets.h"
+#include "mineserver.h"
+#include "map.h"
+#include "packets.h"
#include "cake.h"
View
@@ -27,13 +27,13 @@
#include "chest.h"
-#include "../user.h"
-#include "../permissions.h"
-#include "../nbt.h"
-#include "../mineserver.h"
-#include "../map.h"
-#include "../chat.h"
-#include "../tools.h"
+#include "user.h"
+#include "permissions.h"
+#include "nbt.h"
+#include "mineserver.h"
+#include "map.h"
+#include "chat.h"
+#include "tools.h"
void BlockChest::onStartedDigging(User* user, int8_t status, int32_t x, int8_t y, int32_t z, int map, int8_t direction)
{
View
@@ -28,7 +28,7 @@
#pragma once
#include "basic.h"
-#include "../chunkmap.h"
+#include "chunkmap.h"
class User;
View
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "map.h"
#include "default.h"
View
@@ -25,9 +25,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
-//#include "../logger.h"
+#include "mineserver.h"
+#include "map.h"
+//#include "logger.h"
#include "door.h"
View
@@ -25,11 +25,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
-#include "../plugin.h"
-#include "../logger.h"
-#include "../protocol.h"
+#include "mineserver.h"
+#include "map.h"
+#include "plugin.h"
+#include "logger.h"
+#include "protocol.h"
#include "falling.h"
View
@@ -29,7 +29,7 @@
#define _BLOCKS_FALLING_H
#include "basic.h"
-#include "../user.h"
+#include "user.h"
/**
* BlockFalling deals specifically with blocks that fall when there are empty
View
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "map.h"
#include "fire.h"
View
@@ -25,9 +25,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
-#include "../logger.h"
+#include "mineserver.h"
+#include "map.h"
+#include "logger.h"
#include "ice.h"
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "map.h"
#include "jackolantern.h"
View
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "map.h"
#include "ladder.h"
View
@@ -13,10 +13,10 @@
#include <cmath>
#include "leaves.h"
-#include "../map.h"
-#include "../mineserver.h"
-#include "../constants.h"
-#include "../plugin.h"
+#include "map.h"
+#include "mineserver.h"
+#include "constants.h"
+#include "plugin.h"
bool BlockLeaves::onBroken(User* user, int8_t status, int32_t x, int8_t y, int32_t z, int map, int8_t direction)
View
@@ -25,9 +25,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
-#include "../physics.h"
+#include "mineserver.h"
+#include "map.h"
+#include "physics.h"
#include "liquid.h"
View
@@ -25,8 +25,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "../mineserver.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "map.h"
#include "note.h"
View
@@ -28,9 +28,9 @@
#include <cstdlib>
#include "plant.h"
-#include "../mineserver.h"
-#include "../config.h"
-#include "../map.h"
+#include "mineserver.h"
+#include "config.h"
+#include "map.h"
std::vector<PlantBlockPtr> growingPlants;
View
@@ -31,7 +31,7 @@
#include "basic.h"
-#include "../tr1.h"
+#include "tr1.h"
#include TR1INCLUDE(memory)
Oops, something went wrong.

0 comments on commit d8dcd9b

Please sign in to comment.