diff options
| -rw-r--r-- | build/android/jni/Android.mk | 4 | ||||
| -rw-r--r-- | src/network/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/network/clientpackethandler.cpp (renamed from src/network/packethandlers/client.cpp) | 0 | ||||
| -rw-r--r-- | src/network/serverpackethandler.cpp (renamed from src/network/packethandlers/server.cpp) | 0 |
4 files changed, 5 insertions, 5 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index a35084433..24367a2aa 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -221,9 +221,9 @@ LOCAL_SRC_FILES += \ jni/src/network/connection.cpp \ jni/src/network/networkpacket.cpp \ jni/src/network/clientopcodes.cpp \ + jni/src/network/clientpackethandler.cpp \ jni/src/network/serveropcodes.cpp \ - jni/src/network/packethandlers/server.cpp \ - jni/src/network/packethandlers/client.cpp + jni/src/network/serverpackethandler.cpp \ # lua api LOCAL_SRC_FILES += \ diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 3162469c8..4095ace26 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,7 +1,7 @@ set(common_network_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/connection.cpp ${CMAKE_CURRENT_SOURCE_DIR}/networkpacket.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/packethandlers/server.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/serverpackethandler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/serveropcodes.cpp PARENT_SCOPE ) @@ -9,7 +9,7 @@ set(common_network_SRCS if (BUILD_CLIENT) set(client_network_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/clientopcodes.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/packethandlers/client.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/clientpackethandler.cpp PARENT_SCOPE ) -endif(BUILD_CLIENT)
\ No newline at end of file +endif(BUILD_CLIENT) diff --git a/src/network/packethandlers/client.cpp b/src/network/clientpackethandler.cpp index 5acf04f91..5acf04f91 100644 --- a/src/network/packethandlers/client.cpp +++ b/src/network/clientpackethandler.cpp diff --git a/src/network/packethandlers/server.cpp b/src/network/serverpackethandler.cpp index bb3a53463..bb3a53463 100644 --- a/src/network/packethandlers/server.cpp +++ b/src/network/serverpackethandler.cpp |