Windows: Moved platform-specific sources under "windows"

Consolidating sources under one folder.
skyjake · Nov 13, 2012 · b787a38 · b787a38
1 parent ffca4da
commit b787a38
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 15 deletions.
diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -38,11 +38,11 @@ CONFIG *= thread
 
 # Directories ----------------------------------------------------------------
 
-DENG_API_DIR = $$PWD/engine/api
-DENG_INCLUDE_DIR = $$PWD/engine/include
-DENG_UNIX_INCLUDE_DIR = $$PWD/engine/include/unix
-DENG_MAC_INCLUDE_DIR = $$PWD/engine/include/macx
-DENG_WIN_INCLUDE_DIR = $$PWD/engine/win32/include
+DENG_API_DIR          = $$PWD/engine/api
+DENG_INCLUDE_DIR      = $$PWD/engine/include
+DENG_UNIX_INCLUDE_DIR = $$DENG_INCLUDE_DIR/unix
+DENG_MAC_INCLUDE_DIR  = $$DENG_INCLUDE_DIR/macx
+DENG_WIN_INCLUDE_DIR  = $$DENG_INCLUDE_DIR/windows
 
 # Binaries and generated files are placed here.
 DENG_WIN_PRODUCTS_DIR = $$PWD/../distrib/products

diff --git a/doomsday/engine/engine.pro b/doomsday/engine/engine.pro
@@ -39,7 +39,7 @@ DEFINES += __DOOMSDAY__
 }
 
 win32 {
-    RC_FILE = win32/res/doomsday.rc
+    RC_FILE = res/windows/doomsday.rc
     OTHER_FILES += api/doomsday.def
 }
 else:macx {
@@ -381,14 +381,14 @@ win32 {
     INCLUDEPATH += $$DENG_WIN_INCLUDE_DIR
 
     SOURCES += \
-        win32/src/dd_winit.c \
-        win32/src/directinput.cpp \
-        win32/src/sys_console.c \
-        win32/src/sys_findfile.c \
-        win32/src/joystick_win32.cpp \
-        win32/src/mouse_win32.cpp
-
-    !deng_nodisplaymode: SOURCES += win32/src/displaymode_win32.cpp
+        src/windows/dd_winit.c \
+        src/windows/directinput.cpp \
+        src/windows/sys_console.c \
+        src/windows/sys_findfile.c \
+        src/windows/joystick_win32.cpp \
+        src/windows/mouse_win32.cpp
+
+    !deng_nodisplaymode: SOURCES += src/windows/displaymode_win32.cpp
 }
 else:unix {
     # Common Unix (including Mac OS X).
@@ -754,7 +754,7 @@ macx {
         license.files = doc/LICENSE
         license.path = $$DENG_DOCS_DIR
 
-        icon.files = win32/res/doomsday.ico
+        icon.files = res/windows/doomsday.ico
         icon.path = $$DENG_DATA_DIR/graphics
     }
     else {

diff --git a/doomsday/engine/win32/include/dd_winit.h → doomsday/engine/include/windows/dd_winit.h b/doomsday/engine/win32/include/dd_winit.h → doomsday/engine/include/windows/dd_winit.h
diff --git a/doomsday/engine/win32/include/directinput.h → ...sday/engine/include/windows/directinput.h b/doomsday/engine/win32/include/directinput.h → ...sday/engine/include/windows/directinput.h
diff --git a/doomsday/engine/win32/include/mouse_win32.h → ...sday/engine/include/windows/mouse_win32.h b/doomsday/engine/win32/include/mouse_win32.h → ...sday/engine/include/windows/mouse_win32.h
diff --git a/doomsday/engine/win32/include/resource.h → doomsday/engine/include/windows/resource.h b/doomsday/engine/win32/include/resource.h → doomsday/engine/include/windows/resource.h
diff --git a/doomsday/engine/win32/res/.gitignore → doomsday/engine/res/windows/.gitignore b/doomsday/engine/win32/res/.gitignore → doomsday/engine/res/windows/.gitignore
diff --git a/...ay/engine/win32/res/doomsday.exe.manifest → .../engine/res/windows/doomsday.exe.manifest b/...ay/engine/win32/res/doomsday.exe.manifest → .../engine/res/windows/doomsday.exe.manifest
diff --git a/doomsday/engine/win32/res/doomsday.ico → doomsday/engine/res/windows/doomsday.ico b/doomsday/engine/win32/res/doomsday.ico → doomsday/engine/res/windows/doomsday.ico
diff --git a/doomsday/engine/win32/res/doomsday.rc → doomsday/engine/res/windows/doomsday.rc b/doomsday/engine/win32/res/doomsday.rc → doomsday/engine/res/windows/doomsday.rc
diff --git a/doomsday/engine/win32/src/dd_winit.c → doomsday/engine/src/windows/dd_winit.c b/doomsday/engine/win32/src/dd_winit.c → doomsday/engine/src/windows/dd_winit.c
diff --git a/doomsday/engine/win32/src/directinput.cpp → doomsday/engine/src/windows/directinput.cpp b/doomsday/engine/win32/src/directinput.cpp → doomsday/engine/src/windows/directinput.cpp
diff --git a/...ay/engine/win32/src/displaymode_win32.cpp → .../engine/src/windows/displaymode_win32.cpp b/...ay/engine/win32/src/displaymode_win32.cpp → .../engine/src/windows/displaymode_win32.cpp
diff --git a/doomsday/engine/win32/src/joystick_win32.cpp → ...day/engine/src/windows/joystick_win32.cpp b/doomsday/engine/win32/src/joystick_win32.cpp → ...day/engine/src/windows/joystick_win32.cpp
diff --git a/doomsday/engine/win32/src/mouse_win32.cpp → doomsday/engine/src/windows/mouse_win32.cpp b/doomsday/engine/win32/src/mouse_win32.cpp → doomsday/engine/src/windows/mouse_win32.cpp
diff --git a/doomsday/engine/win32/src/sys_console.c → doomsday/engine/src/windows/sys_console.c b/doomsday/engine/win32/src/sys_console.c → doomsday/engine/src/windows/sys_console.c
diff --git a/doomsday/engine/win32/src/sys_findfile.c → doomsday/engine/src/windows/sys_findfile.c b/doomsday/engine/win32/src/sys_findfile.c → doomsday/engine/src/windows/sys_findfile.c
diff --git a/doomsday/engine/win32/src/sys_window.c → doomsday/engine/src/windows/sys_window.c b/doomsday/engine/win32/src/sys_window.c → doomsday/engine/src/windows/sys_window.c