Fixed compilation of demo on Linux and when not using a separate memory library

Author: devtoi

CMakeLists.txt

@@ -10,16 +10,18 @@ file(GLOB_RECURSE InputSources
 	"Typedefs.h"
 	"LogInput.h"
 )
-
+set(INPUT_MEMORY_LIB)
 if(USE_CUSTOM_ALLOCATOR_HEADER_FOR_INPUT)
+	set(INPUT_MEMORY_LIB Memory)
+	add_definitions(-DINPUT_ALLOCATION_HEADER=${CUSTOM_ALLOCATOR_HEADER_FOR_INPUT})
 else(USE_CUSTOM_ALLOCATOR_HEADER_FOR_INPUT)
 	list(APPEND InputSources "Alloc.h")
-	add_definitions(-DINPUT_ALLOCATION_HEADER=${CUSTOM_ALLOCATOR_HEADER_FOR_INPUT})
+	add_definitions(-DINPUT_ALLOCATION_HEADER="Alloc.h")
 endif(USE_CUSTOM_ALLOCATOR_HEADER_FOR_INPUT)
 
 add_definitions(-DINPUT_DLL_EXPORT)
 add_library(Input SHARED ${InputSources})
-target_link_libraries(Input Utility ${SDL2Library} Memory)
+target_link_libraries(Input Utility ${SDL2Library} ${INPUT_MEMORY_LIB})
 
 install(
 	TARGETS Input DESTINATION lib

Input.h

@@ -4,8 +4,6 @@
 #include <SDL2/SDL_mouse.h>
 #include <SDL2/SDL_events.h>
 #include "InputLibraryDefine.h"
-//#include "Alloc.h"
-#include INPUT_ALLOCATION_HEADER
 
 #define g_Input Input::GetInstance()
 

InputLibraryDefine.h

@@ -8,4 +8,10 @@
 #endif
 #else
 #define INPUT_API
-#endif
+#endif
+
+#ifndef INPUT_ALLOCATION_HEADER
+#include "Alloc.h"
+#else
+#include INPUT_ALLOCATION_HEADER
+#endif

KeyBindingCollection.h

@@ -1,7 +1,5 @@
 #pragma once
 #include <SDL2/SDL_scancode.h>
-//#include "Alloc.h"
-#include INPUT_ALLOCATION_HEADER
 #include "InputLibraryDefine.h"
 #include "Typedefs.h"
 

KeyBindings.h

@@ -2,8 +2,6 @@
 
 #include <map>
 #include <SDL2/SDL_scancode.h>
-//#include "Alloc.h"
-#include INPUT_ALLOCATION_HEADER
 #include "InputLibraryDefine.h"
 #include "KeyBindingCollection.h"
 

LogInput.h

@@ -1,7 +1,6 @@
 #pragma once
 
-//#include "Alloc.h"
-#include INPUT_ALLOCATION_HEADER
+#include "InputLibraryDefine.h"
 
 #ifdef LOG_TO_COUT
 static void LogInput( const rString& message, const char* category = "Input", int severityMask = 0)

TextInput.h

@@ -1,8 +1,6 @@
 #pragma once
 #include <SDL2/SDL_events.h>
 #include "Input.h"
-//#include "Alloc.h"
-#include INPUT_ALLOCATION_HEADER
 
 #define g_TextInput TextInput::GetInstance()
 

demo/CMakeLists.txt

@@ -1,3 +1,3 @@
-add_executable(${CMAKE_PROJECT_NAME} main.cpp)
+add_executable(${CMAKE_PROJECT_NAME} Main.cpp)
 # Link libraries to the executable
-target_link_libraries(${CMAKE_PROJECT_NAME} Utility Input ${SDL2Libraries})
+target_link_libraries(${CMAKE_PROJECT_NAME} Utility Input ${SDL2Libraries})

demo/Main.cpp

@@ -1,11 +1,10 @@
-#include "core/CompileFlags.h"
 #include "../Alloc.h"
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_main.h>
 #include <utility/Logger.h>
-#include <Input.h>
-#include <TextInput.h>
+#include <input/Input.h>
+#include <input/TextInput.h>
 
 void RegisterLogger( );