onepad: Start to separate wx dialog code from linux code, as wxWidgets is multiplatform.

This commit is contained in:
Shanoah Alkire 2018-10-12 22:29:38 -07:00
parent 48d9763d26
commit a892a95af7
10 changed files with 20 additions and 11 deletions

View File

@ -9,7 +9,8 @@ set(compiled_images "${CMAKE_BINARY_DIR}/plugins/onepad/ImgHeader")
set(image_sources "${CMAKE_SOURCE_DIR}/plugins/onepad/Img")
set(linux_sources "Linux")
set(linux_headers "Linux")
set(wx_sources "wx_dialog")
set(wx_headers "wx_dialog")
set(onepadGuiResources
${compiled_images}/analog.h
@ -64,20 +65,26 @@ set(onepadHeaders
resources.h
state_management.h)
# onepad wx sources
set(onepadwxSources
${wx_sources}/dialog.cpp
${wx_sources}/opPanel.cpp
${wx_sources}/GamepadConfiguration.cpp
${wx_headers}/JoystickConfiguration.cpp)
# onepad wx headers
set(onepadwxHeaders
${wx_headers}/opPanel.h
${wx_headers}/GamepadConfiguration.h
${wx_headers}/JoystickConfiguration.h)
# onepad Linux sources
set(onepadLinuxSources
${linux_sources}/ini.cpp
${linux_sources}/dialog.cpp
${linux_sources}/linux.cpp
${linux_sources}/opPanel.cpp
${linux_sources}/GamepadConfiguration.cpp
${linux_headers}/JoystickConfiguration.cpp)
${linux_sources}/linux.cpp)
# onepad Linux headers
set(onepadLinuxHeaders
${linux_headers}/opPanel.h
${linux_headers}/GamepadConfiguration.h
${linux_headers}/JoystickConfiguration.h)
set(onepadLinuxHeaders)
# onepad Windows sources
set(onepadWindowsSources)
@ -98,6 +105,8 @@ set(onepadFinalLibs
set(onepadFinalSources
${onepadSources}
${onepadHeaders}
${onepadwxSources}
${onepadwxHeaders}
${onepadLinuxSources}
${onepadLinuxHeaders}
${onepadGuiResources}

View File

@ -26,7 +26,7 @@
#include <string.h>
#include <gtk/gtk.h>
#include "dialog.h"
#include "wx_dialog/dialog.h"
Display *GSdsp;
Window GSwin;