improve library structure, update documentation

src/RagePhoto.h

@@ -16,14 +16,12 @@
 * responsible for anything with use of the software, you are self responsible.
 *****************************************************************************/
 
-/** \file RagePhoto.h */
-
 #ifndef RAGEPHOTO_H
 #define RAGEPHOTO_H
 
 #ifdef __cplusplus
-#include "libragephoto_data.h"
 #include "libragephoto_global.h"
+#include "RagePhotoData.h"
 #include <unordered_map>
 #include <functional>
 #include <iostream>
@@ -184,6 +182,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdio.h>
 #endif
+/** \file RagePhoto.h */
 /** RagePhoto C++ class typedef for C API. */
 typedef void* ragephoto_t;
 

src/RagePhotoData.h

@@ -16,9 +16,10 @@
 * responsible for anything with use of the software, you are self responsible.
 *****************************************************************************/
 
-#ifndef LIBRAGEPHOTO_DATA_H
-#define LIBRAGEPHOTO_DATA_H
+#ifndef RAGEPHOTODATA_H
+#define RAGEPHOTODATA_H
 
+#ifdef __cplusplus
 #include "libragephoto_global.h"
 #include <iostream>
 #include <cstdint>
@@ -44,5 +45,6 @@ struct LIBRAGEPHOTO_EXPORT RagePhotoData
     uint32_t titlBuffer;
     uint32_t titlOffset;
 };
+#endif // __cplusplus
 
-#endif // LIBRAGEPHOTO_DATA_H
+#endif // RAGEPHOTODATA_H

src/libragephoto_global.h.in

@@ -19,18 +19,25 @@
 #ifndef LIBRAGEPHOTO_GLOBAL_H
 #define LIBRAGEPHOTO_GLOBAL_H
 
+/* CMAKE CONFIG BEGIN */
+#define @LIBRAGEPHOTO_API@
+#define @LIBRAGEPHOTO_LIBTYPE@
+/* CMAKE CONFIG END */
+
+/* RAGEPHOTO LIBRARY EXPORT BEGIN */
 #ifdef _WIN32
 #ifndef LIBRAGEPHOTO_STATIC
 #ifdef LIBRAGEPHOTO_LIBRARY
 #define LIBRAGEPHOTO_EXPORT __declspec(dllexport)
 #else
 #define LIBRAGEPHOTO_EXPORT __declspec(dllimport)
-#endif
+#endif // LIBRAGEPHOTO_LIBRARY
 #else
 #define LIBRAGEPHOTO_EXPORT
-#endif
+#endif // LIBRAGEPHOTO_STATIC
 #else
 #define LIBRAGEPHOTO_EXPORT
-#endif
+#endif // _WIN32
+/* RAGEPHOTO LIBRARY EXPORT END */
 
 #endif // LIBRAGEPHOTO_GLOBAL_H

src/ragephoto.pc.in

@@ -6,4 +6,4 @@ Name: libragephoto
 Description: Open Source RAGE Photo Parser for GTA V
 Version: @PROJECT_VERSION@
 Libs: -L${libdir} -lragephoto
-Cflags: -I${includedir} -D@LIBRAGEPHOTO_API@ -D@LIBRAGEPHOTO_LIBTYPE@
+Cflags: -I${includedir}/RagePhoto