Redacted/ReWindow
2
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 69 Wiki Activity

Update

Browse Source
This commit is contained in:
josh
2024-05-22 07:23:57 -07:00
parent 50ccfe3860
commit a8da7b6bdf
4 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@@ -23,7 +23,7 @@ CPMAddPackage(
CPMAddPackage(
NAME Event
URL https://git.redacted.cc/josh/Event/archive/Release-2.zip
URL https://git.redacted.cc/josh/Event/archive/Release-5.zip
)
find_package(OpenGL REQUIRED)
@@ -42,7 +42,14 @@ if(WIN32)
endif()
include_directories("include")
add_library(ReWindowLibrary SHARED ${SOURCES})
if(UNIX)
add_library(ReWindowLibrary SHARED ${SOURCES})
endif()
if(WIN32)
add_library(ReWindowLibrary STATIC ${SOURCES})
endif()
target_include_directories(ReWindowLibrary PUBLIC ${Event_SOURCE_DIR}/include)
@@ -63,12 +70,12 @@ if(UNIX AND NOT APPLE)
endif()
if(WIN32)
target_compile_options(ReWindowLibrary PRIVATE -Wno-multichar)
#target_compile_options(ReWindowLibrary PRIVATE -Wno-multichar)
target_link_libraries(ReWindowLibrary PUBLIC ${OPENGL_LIBRARIES})
target_link_libraries(ReWindowLibrary PUBLIC J3ML)
target_link_libraries(ReWindowLibrary PUBLIC Event)
add_executable(ReWindowLibraryDemo main.cpp)
target_compile_options(ReWindowLibraryDemo PRIVATE -mwindows)
#target_compile_options(ReWindowLibraryDemo PRIVATE)
target_link_libraries(ReWindowLibraryDemo PUBLIC ReWindowLibrary)
endif()

4
include/rewindow/types/key.h
View File

@@ -51,8 +51,8 @@ namespace Keys {
static const Key F12 {'\u000f', X11Scancode::F12, WindowsScancode::F12};
static const Key NumPad1 {'\b', X11Scancode::KP_1, WindowsScancode::NUMPAD_ONE};
static const Key NumPad2 {'\b', X11Scancode::KP_2, WindowsScancode::NUMPAD_ONE};
static const Key NumPad3 {'\b', X11Scancode::KP_3, WindowsScancode::NUMPAD_ONE};
static const Key NumPad2 {'\b', X11Scancode::KP_2, WindowsScancode::NUMPAD_TWO};
static const Key NumPad3 {'\b', X11Scancode::KP_3, WindowsScancode::NUMPAD_THREE};
static const Key NumPad4 {'\b', X11Scancode::KP_4, WindowsScancode::NUMPAD_ONE};
static const Key NumPad5 {'\b', X11Scancode::KP_5, WindowsScancode::NUMPAD_ONE};
static const Key NumPad6 {'\b', X11Scancode::KP_6, WindowsScancode::NUMPAD_ONE};

3
main.cpp
View File

@@ -81,8 +81,7 @@ int main() {
#endif
#include <windows.h>
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, int nCmdShow) {
int wmain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR pCmdLine, int nCmdShow) {
auto* window = new MyWindow ("Test Window", 600, 480);
window->raise ();

23
meson.build
View File

@@ -1,23 +0,0 @@
project ('ReWindow', 'cpp', version: '0.1.0')
sources = ['spng.c', 'nx/nxObject.m', 'nx/nxApp.m', 'nx/nxWindow.m', 'nx/nxUtil.m', 'nx/nxClipboard.m', 'nx/nxMultiTouch.m', 'nx/nxNav.m', 'State.m', 'Geom.m', 'Surface.m', 'Chunk.m', 'Resource.m', 'gx.m', 'gxMath.c', 'gxTile.m', 'Heap.c', 'uiMenu.m', 'uiFrame.m', 'uiSplit.m', 'uiTool.m', 'main.m', 'Section.m', 'Track.m', 'Plan.m', 'Profile.m', 'Book.m', 'Elevate.m']
includes = include_directories ('/usr/include/gtk-3.0', '/usr/include/libevdev-1.0')
libs = [
dependency ('gio-2.0', version: '>= 2.50'),
dependency ('gdk-3.0', version: '>= 3.20'),
dependency ('gtk+-3.0', version: '>= 3.22'),
dependency ('cairo', version: '>= 1.00'),
compiler.find_library ('m'),
compiler.find_library ('GL'),
compiler.find_library ('objc'),
compiler.find_library ('jpeg'),
compiler.find_library ('evdev'),
]
verse = executable ('verse', [sources, resource],
include_directories: includes,
dependencies: libs,
install: true
)