Randy-Jordan/ci2
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows fix

Browse Source
This commit is contained in:
Randy Jordan
2026-05-12 15:44:00 -05:00
parent 90e91cc25b
commit 01981c10b6
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -25,8 +25,8 @@ ifeq ($(OS), Windows_NT)
PLATFORM_LIBS := -municode -mconsole PLATFORM_LIBS := -municode -mconsole
ifeq ($(CI2_GUI),1) ifeq ($(CI2_GUI),1)
PLATFORM_LIBS := $(filter-out -mconsole, $(PLATFORM_LIBS))
PLATFORM_LIBS += -mwindows PLATFORM_LIBS += -mwindows
PLATFORM_LIBS -= -mconsole
PLATFORM_FLAGS += -DCI2_GUI PLATFORM_FLAGS += -DCI2_GUI
endif endif
@@ -39,7 +39,6 @@ else
PLATFORM_FLAGS := -D LINUX PLATFORM_FLAGS := -D LINUX
PLATFORM_LIBS := PLATFORM_LIBS :=
ifeq ($(CI2_GUI),1) ifeq ($(CI2_GUI),1)
PLATFORM_FLAGS += -DCI2_GUI PLATFORM_FLAGS += -DCI2_GUI
PLATFORM_LIBS += -lX11 PLATFORM_LIBS += -lX11
endif endif

2
include/ci2.h
View File

@@ -32,7 +32,7 @@ SOFTWARE.
extern int WINAPI ci2_wgui( extern int WINAPI ci2_wgui(
HINSTANCE hInstance, HINSTANCE hInstance,
HINSTANCE hPrevInstance, HINSTANCE hPrevInstance,
LPSTR lpCmdLine, LPWSTR lpCmdLine,
int nCmdShow); int nCmdShow);
#else #else
#include <io.h> #include <io.h>

10
src/win32_ci2.c
View File

@@ -22,10 +22,10 @@ SOFTWARE.
* --------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/
#include "../include/ci2.h" #include "../include/ci2.h"
int WINAPI ci2_wWinMain( int WINAPI ci2_wgui(
HINSTANCE hInstance, HINSTANCE hInstance,
HINSTANCE hPrevInstance, HINSTANCE hPrevInstance,
LPSTR pCmdLine, LPWSTR pCmdLine,
int nCmdShow) { int nCmdShow) {
UNUSED(hInstance); UNUSED(hInstance);
@@ -41,7 +41,7 @@ int WINAPI ci2_wWinMain(
wprintf(L"GUI but allocated a console\n"); wprintf(L"GUI but allocated a console\n");
} }
static ci2_sys_char *ci2_window_title = "Win32-GUI Window Title"; static ci2_sys_char *ci2_window_title = L"Win32-GUI Window Title";
CI2_Window* window = ci2_create_window(ci2_window_title, 800, 600); CI2_Window* window = ci2_create_window(ci2_window_title, 800, 600);
if (!window) return 1; if (!window) return 1;
@@ -60,14 +60,14 @@ int WINAPI ci2_wWinMain(
} }
int WINAPI ci2_wmain(int argc, ci2_sys_char *wargv[]) { int WINAPI ci2_wcli(int argc, ci2_sys_char *wargv[]) {
wprintf(L"Console present. argc=%d\n", argc); wprintf(L"Console present. argc=%d\n", argc);
UNUSED(wargv); UNUSED(wargv);
if (!ci2_init()) return 1; if (!ci2_init()) return 1;
static ci2_sys_char *ci2_window_title = "Win32-CLI Window Title"; static ci2_sys_char *ci2_window_title = L"Win32-CLI Window Title";
CI2_Window* window = ci2_create_window(ci2_window_title, 800, 600); CI2_Window* window = ci2_create_window(ci2_window_title, 800, 600);
if (!window) return 1; if (!window) return 1;

3
tests/01_main.c
View File

@@ -21,11 +21,12 @@ SOFTWARE.
* --------------------------------------------------------------------------*/ * --------------------------------------------------------------------------*/
#define DEBUG #define DEBUG
#define GUI_DEBUG_CLOSE
#include "../include/ci2.h" #include "../include/ci2.h"
#ifdef CI2_WINDOWS #ifdef CI2_WINDOWS
#ifdef CI2_GUI #ifdef CI2_GUI
int WINAPI WinMain( int WINAPI wWinMain(
HINSTANCE hInstance, HINSTANCE hInstance,
HINSTANCE hPrevInstance, HINSTANCE hPrevInstance,
LPSTR lpCmdLine, LPSTR lpCmdLine,