소스 검색

UPnP: Fix includes of thirdparty headers

Rémi Verschelde 7 년 전
부모
커밋
af57515775
6개의 변경된 파일16개의 추가작업 그리고 9개의 파일을 삭제
  1. 3 1
      modules/upnp/register_types.cpp
  2. 4 2
      modules/upnp/upnp.cpp
  3. 4 3
      modules/upnp/upnp.h
  4. 3 1
      modules/upnp/upnpdevice.cpp
  5. 1 1
      modules/upnp/upnpdevice.h
  6. 1 1
      thirdparty/miniupnpc/miniupnpcstrings.h

+ 3 - 1
modules/upnp/register_types.cpp

@@ -29,7 +29,9 @@
 /*************************************************************************/
 
 #include "register_types.h"
-#include "error_macros.h"
+
+#include "core/error_macros.h"
+
 #include "upnp.h"
 #include "upnpdevice.h"
 

+ 4 - 2
modules/upnp/upnp.cpp

@@ -29,8 +29,10 @@
 /*************************************************************************/
 
 #include "upnp.h"
-#include "miniupnpc/miniwget.h"
-#include "upnpcommands.h"
+
+#include <miniupnpc/miniwget.h>
+#include <miniupnpc/upnpcommands.h>
+
 #include <stdlib.h>
 
 bool UPNP::is_common_device(const String &dev) const {

+ 4 - 3
modules/upnp/upnp.h

@@ -31,9 +31,10 @@
 #ifndef GODOT_UPNP_H
 #define GODOT_UPNP_H
 
-#include "miniupnpc/miniupnpc.h"
-#include "upnpdevice.h"
-#include <reference.h>
+#include "core/reference.h"
+
+#include <miniupnpc/miniupnpc.h>
+#include <miniupnpc/upnpdevice.h>
 
 class UPNP : public Reference {
 

+ 3 - 1
modules/upnp/upnpdevice.cpp

@@ -29,8 +29,10 @@
 /*************************************************************************/
 
 #include "upnpdevice.h"
+
 #include "upnp.h"
-#include "upnpcommands.h"
+
+#include <miniupnpc/upnpcommands.h>
 
 String UPNPDevice::query_external_address() const {
 	ERR_FAIL_COND_V(!is_valid_gateway(), "");

+ 1 - 1
modules/upnp/upnpdevice.h

@@ -31,7 +31,7 @@
 #ifndef GODOT_UPNPDEVICE_H
 #define GODOT_UPNPDEVICE_H
 
-#include <reference.h>
+#include "core/reference.h"
 
 class UPNPDevice : public Reference {
 

+ 1 - 1
thirdparty/miniupnpc/miniupnpcstrings.h

@@ -1,7 +1,7 @@
 #ifndef MINIUPNPCSTRINGS_H_INCLUDED
 #define MINIUPNPCSTRINGS_H_INCLUDED
 
-#include <version.h>
+#include "core/version.h"
 
 #define OS_STRING VERSION_NAME "/1.0"
 #define MINIUPNPC_VERSION_STRING "2.1"