summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Auras <andy@halstenbach.de>2011-09-24 23:15:58 (GMT)
committerAndreas Auras <andy@halstenbach.de>2011-09-24 23:15:58 (GMT)
commit29977fc5165fb4d26acc4f607d8408d9cabf36f8 (patch)
treedb24136e998e3639830817f7fd6dabaeb2c11a6f
parent5d2684d2a77ef457197c146f1406a406ff9b5ea3 (diff)
downloaddf10ch-atmolight-controller-29977fc5165fb4d26acc4f607d8408d9cabf36f8.tar.gz
df10ch-atmolight-controller-29977fc5165fb4d26acc4f607d8408d9cabf36f8.tar.bz2
Some enhancements to windows port
-rw-r--r--project/df10ch_test/df10ch_test.vcxproj4
-rw-r--r--winsetup.py11
2 files changed, 3 insertions, 12 deletions
diff --git a/project/df10ch_test/df10ch_test.vcxproj b/project/df10ch_test/df10ch_test.vcxproj
index d0a7d41..4ffec4a 100644
--- a/project/df10ch_test/df10ch_test.vcxproj
+++ b/project/df10ch_test/df10ch_test.vcxproj
@@ -49,7 +49,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;HAVE_LIBUSB_STRERROR;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
@@ -67,7 +67,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;HAVE_LIBUSB_STRERROR;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..\libusb\libusb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
diff --git a/winsetup.py b/winsetup.py
index f2fa0cb..8f9052d 100644
--- a/winsetup.py
+++ b/winsetup.py
@@ -36,15 +36,6 @@ setup(name='df10ch_setup',
data_files = [ ( '', [ 'project/df10ch_test/Release/df10ch_test.exe',
'../libusb/Win32/Release/dll/libusb-1.0.dll',
'../zadig.exe',
- 'windows/df10ch_setup.bat',
- 'HISTORY',
- 'COPYING',
- 'README' ] ),
- ( 'firmware', [ 'usb_appl/df10ch_usb_appl.dff',
- 'usb_appl/df10ch_usb_appl.hex',
- 'usb_boot/df10ch_usb_boot.hex',
- 'pwm_appl/df10ch_pwm_appl.dff',
- 'pwm_appl/df10ch_pwm_appl.hex',
- 'pwm_boot/df10ch_pwm_boot.hex' ] ) ],
+ 'windows/df10ch_setup.bat' ] ) ]
)